Description: Migrate from php-mysql to php-mysqli
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>

--- a/gofax/gofax/faxreports/class_faxreport.inc
+++ b/gofax/gofax/faxreports/class_faxreport.inc
@@ -125,26 +125,21 @@
         if(!isset($this->config->data['SERVERS']['FAX'])){
             msg_dialog::display(_("Error"), _("No FAX server found!"), ERROR_DIALOG);
             return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
-        }elseif(!is_callable("mysql_connect")){
+        }elseif(!is_callable("mysqli_connect")){
             msg_dialog::display(_("Configuration error"), sprintf(
-                _("Missing %s PHP extension!"), "mysql"), WARNING_DIALOG);
+                _("Missing %s PHP extension!"), "mysqli"), WARNING_DIALOG);
             return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
         }else{
             /* Connecting, selecting database */
             $cfg	= $this->config->data['SERVERS']['FAX'];
-            $link 	= @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']);
+            $link 	= @mysqli_connect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD'], "gofax");
             if ($link === FALSE){
                 msg_dialog::display(_("Error"), sprintf(
                     _("Cannot connect to %s database!"), "<b>".$cfg['SERVER'].":"."GOfax"."</b>"), ERROR_DIALOG);
                 return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
             }
-            if (! @mysql_select_db("gofax")){
-                msg_dialog::display(_("Error"), sprintf(
-                    _("Cannot select %s database!"), "GOfax"), ERROR_DIALOG);
-                return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
-            }
 
-            if (! mysql_query("SELECT * FROM faxlog;")){
+            if (! mysqli_query($link, "SELECT * FROM faxlog;")){
                 msg_dialog::display(_("Error"), sprintf(
                     _("Cannot query %s database!"), "GOfax"), ERROR_DIALOG);
                 return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
@@ -168,15 +163,15 @@
                 "receiver_msn,pages,status_message,transfer_time FROM faxlog WHERE id='".$detail."';";
 
             $cfg= $this->config->data['SERVERS']['FAX'];
-            $result = @mysql_query($query);
+            $result = @mysqli_query($link, $query);
             if ($result === false){
                 msg_dialog::display(_("Error"), sprintf(
                     _("Cannot query %s database!"), "GOfax"), ERROR_DIALOG);
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query failed");
                 return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
             }
-            $line = mysql_fetch_array($result, MYSQL_ASSOC);
-            mysql_close($link);
+            $line = mysqli_fetch_array($result, MYSQL_ASSOC);
+            mysqli_close($link);
 
             // Get dn to check ACLs for
             // Existing ldap-user -> use its dn  
@@ -272,11 +267,11 @@
 
 
         $cfg= $this->config->data['SERVERS']['FAX'];
-        $link = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']);
+        $link = @mysqli_connect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD'], "gofax");
 
         // Get the results 
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query");
-        $result =@mysql_query($query_entries);
+        $result =@mysqli_query($link, $query_entries);
         if ($result === false){
             msg_dialog::display(_("Error"), sprintf(_("Cannot query %s database!"), "GOfax"), ERROR_DIALOG);
             return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
@@ -289,7 +284,7 @@
         // Add found entries to result list.
         $report_list= array();
         $user_ids = array_flip($fax_users);
-        while ($line = mysql_fetch_array($result, MYSQL_ASSOC)) {
+        while ($line = mysqli_fetch_array($result, MYSQL_ASSOC)) {
 
             // Get dn to check ACLs for
             // Existing ldap-user -> use its dn  
@@ -362,7 +357,7 @@
             }
             $report_list[] =  $str;
         }
-        mysql_close($link);
+        mysqli_close($link);
 
         $entry_count = count($report_list);
         if($this->start >=$entry_count) $this->start =0;
--- a/gofon/admin/ogroups/gofon/class_phonequeue.inc
+++ b/gofon/admin/ogroups/gofon/class_phonequeue.inc
@@ -73,7 +73,7 @@
          */
         if(isset($config->data['SERVERS']['FON']) && 
                 count($config->data['SERVERS']['FON']) &&
-                is_callable("mysql_connect")){
+                is_callable("mysqli_connect")){
 
             /* Set available server */
             $this->goFonHomeServers = $config->data['SERVERS']['FON'];
@@ -143,8 +143,8 @@
     function check_database_accessibility()
     {
         /* Check if mysql extension is available */
-        if(!is_callable("mysql_pconnect")){
-            return(msgPool::missingext("mysql"));
+        if(!is_callable("mysqli_connect")){
+            return(msgPool::missingext("mysqli"));
         }
 
         /********************
@@ -152,16 +152,10 @@
          ********************/
 
         $cfg_Current  = $this->goFonHomeServers[$this->goFonHomeServer];
-        $r_current    =  @mysql_pconnect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD']);
+        $r_current    =  @mysqli_connect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD'], $cfg_Current['DB']);
         if(!$r_current){
-            new log("debug","ogroups/".get_class($this),"",array(),@mysql_error($r_current));
-            return(msgPool::dbconnect("GOfon",@mysql_error($r_current),$cfg_Current['SERVER']));
-        }
-        $db_current  =  @mysql_select_db($cfg_Current['DB'],$r_current);
-        if(!$db_current){
-            new log("debug","ogroups/".get_class($this),"",array(),@mysql_error($r_current));
-            mysql_close($r_current);
-            return(msgPool::dbselect("GOfon",@mysql_error($r_current),$cfg_Current['DB']));
+            new log("debug","ogroups/".get_class($this),"",array(),@mysqli_error($r_current));
+            return(msgPool::dbconnect("GOfon",@mysqli_error($r_current),$cfg_Current['SERVER'].":".$cfg_Current['DB']));
         }
 
         /********************
@@ -170,16 +164,10 @@
 
         if($this->initially_was_account){
             $cfg_Init  = $this->goFonHomeServers[$this->init_HomeServer] ;
-            $r_init    =  @mysql_pconnect($cfg_Init['SERVER'],$cfg_Init['LOGIN'],$cfg_Init['PASSWORD']);
+            $r_init    =  @mysqli_connect($cfg_Init['SERVER'],$cfg_Init['LOGIN'],$cfg_Init['PASSWORD'], $cfg_Init['DB']);
             if(!$r_init){
-                new log("debug","ogroups/".get_class($this),"",array(),@mysql_error($r_init));
-                return(msgPool::dbconnect("GOfon",@mysql_error($r_current),$cfg_Init['SERVER']));
-            }
-            $db_init  =  @mysql_select_db($cfg_Init['DB'],$r_init);
-            if(!$db_init){
-                new log("debug","ogroups/".get_class($this),"",array(),@mysql_error($r_init));
-                mysql_close($r_init);
-                return(msgPool::dbselect("GOfon",@mysql_error($r_current),$cfg_Init['DB']));
+                new log("debug","ogroups/".get_class($this),"",array(),@mysqli_error($r_init));
+                return(msgPool::dbconnect("GOfon",@mysqli_error($r_current),$cfg_Init['SERVER'].":".$cfg_Init['DB']));
             }
         }
     }
@@ -358,8 +346,7 @@
 
             /* Connect to current database to be able to add new entries */
             $cfg_Current  = $this->goFonHomeServers[$this->init_HomeServer] ;
-            $res_cur      =  @mysql_pconnect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD']);
-            $db_cur       =  @mysql_select_db($cfg_Current['DB'],$res_cur);
+            $res_cur      =  @mysqli_connect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD'],$cfg_Current['DB']);
 
             /* Create sql entries */
             $delete[]=    "DELETE FROM ".$cfg_Current['EXT_TABLE']."    WHERE exten='".$this->old_cn."';\n";
@@ -372,10 +359,10 @@
             /* Execute the queries */  
             if($save){
                 foreach($delete as $sql){
-                    $res = @mysql_query($sql,$res_cur);
+                    $res = @mysqli_query($res_cur,$sql);
                     if(!$res){
-                        new log("debug","ogroups/".get_class($this),"",array(),@mysql_error($r_current));
-                        return(msgPool::dbquery(_("GOfon"),@mysql_error($r_current)));
+                        new log("debug","ogroups/".get_class($this),"",array(),@mysqli_error($r_current));
+                        return(msgPool::dbquery(_("GOfon"),@mysqli_error($r_current)));
                     }
                 }
             }
@@ -406,8 +393,7 @@
 
         /* Connect to current database to be able to add new entries */
         $cfg_Current  = $this->goFonHomeServers[$this->goFonHomeServer] ;
-        $res_cur      =  @mysql_pconnect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD']);
-        $db_cur       =  @mysql_select_db($cfg_Current['DB'],$res_cur);
+        $res_cur      =  @mysqli_connect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD'],$cfg_Current['DB']);
 
         /* Connect to old home server and remove old entries if necessary */
         if(($this->initially_was_account) && ($this->init_HomeServer != $this->goFonHomeServer)){
@@ -431,12 +417,12 @@
              *  else update the entry with new values.
              */
             $query = "SELECT * FROM ".$cfg_Current['QUEUE_TABLE']."  WHERE name='".$this->old_cn."';";
-            $res   = mysql_query($query,$res_cur);
+            $res   = mysqli_query($res_cur,$query);
             if(!$res){
-                new log("debug","ogroups/".get_class($this),"",array(),@mysql_error($res_cur));
+                new log("debug","ogroups/".get_class($this),"",array(),@mysqli_error($res_cur));
                 return(_("Cannot find old queue entry!"));
             }
-            $cnt = mysql_affected_rows($res_cur);
+            $cnt = mysqli_affected_rows($res_cur);
 
 
             /* Create queue table entry 
@@ -502,7 +488,7 @@
 
                 /* Update queue table entry 
                  */
-                $queue_old = @mysql_fetch_assoc($res);
+                $queue_old = @mysqli_fetch_assoc($res);
                 foreach($queue_old as $name => $value){
                     if(isset($queue[$name]) && $queue[$name] == $value){
                         unset($queue[$name]);
@@ -726,13 +712,13 @@
             /* Do all collected mysql queries 
              */
             foreach($SQL as $query)
-                $res   = mysql_query($query,$res_cur);
+                $res   = mysqli_query($res_cur,$query);
             if(!$res){
-                new log("debug","ogroups/".get_class($this),"",array(),@mysql_error($res_cur));
-                return(msgPool::dbquery(_("GOfon"),@mysql_error($res_cur)));
+                new log("debug","ogroups/".get_class($this),"",array(),@mysqli_error($res_cur));
+                return(msgPool::dbquery(_("GOfon"),@mysqli_error($res_cur)));
             }
         }
-        @mysql_close($r_con);
+        @mysqli_close($r_con);
         return(false);
     }
 
--- a/gofon/gofon/conference/class_phoneConferenceGeneric.inc
+++ b/gofon/gofon/conference/class_phoneConferenceGeneric.inc
@@ -84,7 +84,7 @@
          */
         $a_SETUP= array();
         $config = session::get('config');
-        if(isset($config->data['SERVERS']['FON']) && is_callable("mysql_connect")) {
+        if(isset($config->data['SERVERS']['FON']) && is_callable("mysqli_connect")) {
 
             /* Set available server */
             $this->goFonHomeServers = $config->data['SERVERS']['FON'];
@@ -297,8 +297,8 @@
     function check_database_accessibility()
     {
         /* Check if mysql extension is available */
-        if(!is_callable("mysql_pconnect")){
-            return(msgPool::missingext("php-mysql"));
+        if(!is_callable("mysqli_connect")){
+            return(msgPool::missingext("php-mysqli"));
         }
 
         /********************
@@ -306,16 +306,10 @@
          ********************/
 
         $cfg_Current  = $this->goFonHomeServers[$this->goFonHomeServer];
-        $r_current    =  @mysql_pconnect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD']);
-        if(!$r_current){
-            new log("debug","gofonconference/".get_class($this),"",array(),@mysql_error($r_current));
-            return(msgPool::dbconnect("GOfon",@mysql_error($r_current), $cfg_Current['SERVER']));
-        }
-        $db_current  =  @mysql_select_db($cfg_Current['DB'],$r_current);
-        if(!$db_current){
-            new log("debug","gofonconference/".get_class($this),"",array(),@mysql_error($r_current));
-            mysql_close($r_current);
-            return(msgPool::dbselect("GOfon",@mysql_error($r_current), $cfg_Current['DB']));
+        $r_current    =  @mysqli_connect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD'], $cfg_Current['DB']);
+        if(mysqli_connect_err($r_current)){
+            new log("debug","gofonconference/".get_class($this),"",array(),@mysqli_error($r_current));
+            return(msgPool::dbconnect("GOfon",@mysqli_error($r_current), $cfg_Current['SERVER'].":".$cfg_Current['DB']));
         }
 
         /********************
@@ -324,16 +318,10 @@
 
         if($this->goFonHomeServers != $this->init_HomeServer){
             $cfg_Init  = $this->goFonHomeServers[$this->init_HomeServer] ;
-            $r_init    =  @mysql_pconnect($cfg_Init['SERVER'],$cfg_Init['LOGIN'],$cfg_Init['PASSWORD']);
-            if(!$r_init){
-                new log("debug","gofonconference/".get_class($this),"",array(),@mysql_error($r_init));
-                return(msgPool::dbconnect("GOfon",@mysql_error($r_current), $cfg_Init['SERVER']));
-            }
-            $db_init  =  @mysql_select_db($cfg_Init['DB'],$r_init);
-            if(!$db_init){
-                new log("debug","gofonconference/".get_class($this),"",array(),@mysql_error($r_init));
-                mysql_close($r_init);
-                return(msgPool::dbselect("GOfon",@mysql_error($r_current), $cfg_Init['DB']));
+            $r_init    =  @mysqli_connect($cfg_Init['SERVER'],$cfg_Init['LOGIN'],$cfg_Init['PASSWORD', $cfg_Init['DB']]);
+            if(mysqli_connect_err($r_init)){
+                new log("debug","gofonconference/".get_class($this),"",array(),@mysqli_error($r_init));
+                return(msgPool::dbconnect("GOfon",@mysqli_error($r_current), $cfg_Init['SERVER'].":".$cfg_Init['DB']));
             }
         }
     }
@@ -428,8 +416,7 @@
         /* Connect to current database to be able to add new entries */
         $SQL=array();
         $cfg_Current  = $this->goFonHomeServers[$this->goFonHomeServer] ;
-        $res_cur      =  @mysql_pconnect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD']);
-        $db_cur       =  @mysql_select_db($cfg_Current['DB'],$res_cur);
+        $res_cur      =  @mysqli_connect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD'], $cfg_Current['DB']);
 
         /********************
          * Remove entries that could cause trouble  
@@ -450,17 +437,17 @@
          * We must remove those entries to avoid duplicate use of the same extension name.
          */
         if($this->goFonHomeServer != $this->init_HomeServer){
-            $query = "SELECT id FROM ".$cfg_Current['EXT_TABLE']." WHERE exten='".mysql_real_escape_string($this->telephoneNumber)."' OR exten='".$this->cn."';";
-            $res = @mysql_query($query,$res_cur);
+            $query = "SELECT id FROM ".$cfg_Current['EXT_TABLE']." WHERE exten='".mysqli_real_escape_string($this->telephoneNumber)."' OR exten='".$this->cn."';";
+            $res = @mysqli_query($res_cur, $query);
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query");
             if(!$res){
-                new log("debug","gofonconference/".get_class($this),"",array(),@mysql_error($res_cur));
-                return(msgPool::dbquery("GOfon", @mysql_error($res_cur),$cfg_Current['SERVER']));
+                new log("debug","gofonconference/".get_class($this),"",array(),@mysqli_error($res_cur));
+                return(msgPool::dbquery("GOfon", @mysqli_error($res_cur),$cfg_Current['SERVER']));
             }
-            if($save && mysql_affected_rows($res_cur)) {
+            if($save && mysqli_affected_rows($res_cur)) {
                 $SQL[] = "DELETE FROM ".$cfg_Current['EXT_TABLE']." 
-                    WHERE   (exten='".mysql_real_escape_string($this->telephoneNumber)."') 
-                    OR    (exten='".mysql_real_escape_string($this->cn)."')";
+                    WHERE   (exten='".mysqli_real_escape_string($this->telephoneNumber)."') 
+                    OR    (exten='".mysqli_real_escape_string($this->cn)."')";
             }
         }
 
@@ -574,7 +561,7 @@
                 $s_values = ""; 
                 foreach($valtop as $key=>$val){
                     $s_keys   .="`".$key."`,";
-                    $s_values .="'".mysql_real_escape_string($val)."',";
+                    $s_values .="'".mysqli_real_escape_string($val)."',";
                 }
                 $s_keys   =preg_replace("/\,$/","",$s_keys); 
                 $s_values =preg_replace("/\,$/","",$s_values); 
@@ -585,34 +572,34 @@
              */
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Updating/Inserting entries---</b>","");
 
-            mysql_query("begin;",$res_cur);
+            mysqli_query($res_cur, "begin;");
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>begin;</b>","<i>Starting transaction!</i>");
 
             foreach($SQL as $query){
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>".$query."</b>", "");
-                if(!mysql_query($query,$res_cur)){
-                    $err = mysql_error($res_cur);
+                if(!mysqli_query($res_cur, $query)){
+                    $err = mysqli_error($res_cur);
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"\n".$err, "<b>FAILED</b>");
                     msg_dialog::display(_("Error"),
                             msgPool::mysqlerror($err,__CLASS__)."&nbsp;".
                             "\n<p>"._("Please activate debugging for details!")."</p>",
                             ERROR_DIALOG);
 
-                    mysql_query("rollback;",$res_cur);
+                    mysqli_query($res_cur, "rollback;");
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>rollback;</b>", "<b>ERROR</b> Rollback transaction!");
-                    @mysql_close($res_cur);
+                    @mysqli_close($res_cur);
                     return(false);
                 }
             }
 
             /* Let changes get active, everything was fine;
              */
-            mysql_query("commit;",$res_cur);
+            mysqli_query($res_cur, "commit;");
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>commit;</b>", "");
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Transaction sucessful!---</b>", "");
         } 
 
-        @mysql_close($res_cur);
+        @mysqli_close($res_cur);
     }
 
 
@@ -636,34 +623,33 @@
 
         /* Connect to old database */
         $cfg_Init  = $this->goFonHomeServers[$this->init_HomeServer] ;
-        $r_init    =  @mysql_pconnect($cfg_Init['SERVER'],$cfg_Init['LOGIN'],$cfg_Init['PASSWORD']);
-        $db_init   =  @mysql_select_db($cfg_Init['DB'],$r_init);
+        $r_init    =  @mysqli_connect($cfg_Init['SERVER'],$cfg_Init['LOGIN'],$cfg_Init['PASSWORD'], $cfg_Init['DB']);
 
         /* Check if there is an old entry */
-        $query = "SELECT id FROM ".$cfg_Init['EXT_TABLE']." WHERE exten='".mysql_real_escape_string($this->old_tele_number)."' OR exten='".mysql_real_escape_string($this->old_cn)."';";
-        $res = @mysql_query($query,$r_init);
+        $query = "SELECT id FROM ".$cfg_Init['EXT_TABLE']." WHERE exten='".mysqli_real_escape_string($this->old_tele_number)."' OR exten='".mysqli_real_escape_string($this->old_cn)."';";
+        $res = @mysqli_query($r_init,$query);
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query");
         if(!$res){
-            new log("debug","gofonconference/".get_class($this),"",array(),@mysql_error($r_init));
-            return(msgPool::dbquery("GOfon", @mysql_error($res_cur),$cfg_Init['SERVER']));
+            new log("debug","gofonconference/".get_class($this),"",array(),@mysqli_error($r_init));
+            return(msgPool::dbquery("GOfon", @mysqli_error($res_cur),$cfg_Init['SERVER']));
         }
 
         /* There are entries using this cn and/or phone number */
-        if($save && mysql_affected_rows($r_init)) {
+        if($save && mysqli_affected_rows($r_init)) {
             $SQL = "DELETE FROM ".$cfg_Init['EXT_TABLE']." 
-                WHERE   (exten='".mysql_real_escape_string($this->old_tele_number)."') 
-                OR    (exten='".mysql_real_escape_string($this->old_cn)."')";
+                WHERE   (exten='".mysqli_real_escape_string($this->old_tele_number)."') 
+                OR    (exten='".mysqli_real_escape_string($this->old_cn)."')";
 
             /* Query and ensure that everything went fine */
-            $res =  @mysql_query($SQL,$r_init);
+            $res =  @mysqli_query($r_init,$SQL);
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$SQL, "Database query");
             if(!$res){
-                new log("debug","gofonconference/".get_class($this),"",array(),@mysql_error($r_init));
-                return(msgPool::dbquery("GOfon", @mysql_error($res_cur),$cfg_Init['SERVER']));
+                new log("debug","gofonconference/".get_class($this),"",array(),@mysqli_error($r_init));
+                return(msgPool::dbquery("GOfon", @mysqli_error($res_cur),$cfg_Init['SERVER']));
             }
 
         }//ENDE  old num availiable ...
-        @mysql_close($r_init);
+        @mysqli_close($r_init);
         return(false);
     }
 
--- a/gofon/gofon/fonreports/class_fonreport.inc
+++ b/gofon/gofon/fonreports/class_fonreport.inc
@@ -180,8 +180,8 @@
             msg_dialog::display(_("Configuration error"), msgPool::noserver(
                         _("GOfon")), WARNING_DIALOG);
             return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
-        }elseif(!is_callable("mysql_connect")){
-            msg_dialog::display(_("Configuration error"), msgPool::missingext("php-mysql"), WARNING_DIALOG);
+        }elseif(!is_callable("mysqli_connect")){
+            msg_dialog::display(_("Configuration error"), msgPool::missingext("php-mysqli"), WARNING_DIALOG);
             return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
         }else{
 
@@ -196,15 +196,10 @@
                 }
             }
 
-            $link = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']);
-            if ($link === FALSE){
+            $link = @mysqli_connect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD'], $cfg['DB']);
+            if (mysqli_connect_errno($link)){
                 msg_dialog::display(_("Error"), msgPool::dbconnect(
-                            _("GOfon"),@mysql_error(),$cfg['SERVER']),ERROR_DIALOG);
-                return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
-            }
-            if (! @mysql_select_db("gophone")){
-                msg_dialog::display(_("Error"), msgPool::dbselect(
-                            _("GOfon"),@mysql_error(),$cfg['DB']),ERROR_DIALOG);
+                            _("GOfon"),@mysqli_error(),$cfg['SERVER'].":".$cfg['DB']),ERROR_DIALOG);
                 return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
             }
         }
@@ -215,13 +210,12 @@
          *****************/
 
         // Get entries for the selected range only.
-        $link   = @mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD']);
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query");
         $query  = $this->CreateQuerySyntax();
-        $result = @mysql_query($query);
+        $result = @mysqli_query($link, $query);
         if ($result === false){
             msg_dialog::display(_("Error"), msgPool::dbquery(
-                        _("GOfon"),@mysql_error(),$cfg['SERVER']),ERROR_DIALOG);
+                        _("GOfon"),@mysqli_error(),$cfg['SERVER']),ERROR_DIALOG);
             return($smarty->fetch(get_template_path('contents.tpl', TRUE)));
         }
 
@@ -238,7 +232,7 @@
 
         $no_acl = "&nbsp;-";
 
-        while ($line = mysql_fetch_array($result, MYSQL_ASSOC)) {
+        while ($line = mysqli_fetch_array($result, MYSQL_ASSOC)) {
 
             // Get dn to check ACLs for
             // Existing ldap-user -> use its dn
@@ -291,7 +285,7 @@
             $report_list[] = $append_str;
         }
 
-        @mysql_close($link);
+        @mysqli_close($link);
 
 
         /*****************
@@ -410,9 +404,9 @@
 
         $query = "SELECT {$fieldset} FROM cdr ".
             "WHERE   
-            calldate <= ".mysql_real_escape_string($end)." 
+            calldate <= ".mysqli_real_escape_string($end)." 
             AND 
-            calldate >= ".mysql_real_escape_string($start)." 
+            calldate >= ".mysqli_real_escape_string($start)." 
             ". $uidstring." 
             ORDER BY ".$this->fields[$this->sort]." $desc";
 
--- a/gofon/gofon/macro/class_gofonMacro.inc
+++ b/gofon/gofon/macro/class_gofonMacro.inc
@@ -159,24 +159,18 @@
     function check_database_accessibility()
     {
         /* Check if mysql extension is available */
-        if(!is_callable("mysql_pconnect")){
-            return(msgPool::missingext("php-mysql"));
+        if(!is_callable("mysqli_connect")){
+            return(msgPool::missingext("php-mysqli"));
         }
 
         /********************
          * Check all home server
          ********************/
         foreach($this->goFonHomeServers as $goFonHomeServer => $cfg_Current){
-            $r_current    =  @mysql_pconnect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD']);
-            if(!$r_current){
-                new log("debug","gofonmacro/".get_class($this),"",array(),@mysql_error($r_current));
-                return ( msgPool::dbconnect("GOfon",@mysql_error(),$cfg_Current['SERVER']));
-            }
-            $db_current  =  @mysql_select_db($cfg_Current['DB'],$r_current);
-            if(!$db_current){
-                new log("debug","gofonmacro/".get_class($this),"",array(),@mysql_error($r_current));
-                mysql_close($r_current);
-                return ( msgPool::dbselect("GOfon",@mysql_error(),$cfg_Current['DB']));
+            $r_current    =  @mysqli_connect($cfg_Current['SERVER'],$cfg_Current['LOGIN'],$cfg_Current['PASSWORD'],$cfg_Current['DB']);
+            if(mysqli_connect_error($r_current)){
+                new log("debug","gofonmacro/".get_class($this),"",array(),@mysqli_error($r_current));
+                return ( msgPool::dbconnect("GOfon",@mysqli_error(),$cfg_Current['SERVER'].":".$cfg_Current['DB']));
             }
         }
     }
@@ -200,21 +194,20 @@
         /* Remove current macro from each server available */ 
         if($save){
             foreach($this->goFonHomeServers as $dn => $Server){
-                $query      = "DELETE FROM ".$Server['EXT_TABLE']." WHERE context='".mysql_real_escape_string($context)."';";
-                $r_current  =  @mysql_pconnect($Server['SERVER'],$Server['LOGIN'],$Server['PASSWORD']);
-                $db_current =  @mysql_select_db($Server['DB'],$r_current);
-                $res = @mysql_query($query,$r_current);
+                $query      = "DELETE FROM ".$Server['EXT_TABLE']." WHERE context='".mysqli_real_escape_string($context)."';";
+                $r_current  =  @mysqli_connect($Server['SERVER'],$Server['LOGIN'],$Server['PASSWORD'],$Server['DB']);
+                $res = @mysqli_query($r_current,$query);
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query");
                 if(!$res){
-                    new log("debug","gofonmacro/".get_class($this),"",array(),@mysql_error($r_current));
+                    new log("debug","gofonmacro/".get_class($this),"",array(),@mysqli_error($r_current));
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>".$query."</b>", "ERROR");
-                    trigger_error(mysql_error($r_current));
+                    trigger_error(mysqli_error($r_current));
                     return(
                             sprintf(
                                 _("Macro could not be removed from server '%s', please check database consistency!"), 
                                 $Server['SERVER']));
                 }
-                @mysql_close($r_current);
+                @mysqli_close($r_current);
             }
         }
     }
@@ -244,8 +237,7 @@
 
         /* Macro are spread to each asterisk server */
         foreach($this->goFonHomeServers as $dn => $cfg){
-            $r_con  = @mysql_pconnect($cfg['SERVER'],$cfg['LOGIN'],$cfg['PASSWORD']); 
-            $db     = @mysql_select_db($cfg['DB'],$r_con);
+            $r_con  = @mysqli_connect($cfg['SERVER'],$cfg['LOGIN'],$cfg['PASSWORD'],$cfg['DB']); 
 
             /************
              * Parse Macro content
@@ -308,11 +300,11 @@
                  *  and add this line to an array that will be inserted 
                  *  to each database.
                  */
-                $context= mysql_real_escape_string($context);
-                $exten  = mysql_real_escape_string($tmp[0]);
-                $prio   = mysql_real_escape_string($tmp[1]);
-                $app    = mysql_real_escape_string(preg_replace("/\(.*\).*$/","",$tmp[2]));
-                $para   = mysql_real_escape_string(preg_replace("/^[^(]*\((.*)\)[^)]*$/", "$1", $tmp[2]));
+                $context= mysqli_real_escape_string($context);
+                $exten  = mysqli_real_escape_string($tmp[0]);
+                $prio   = mysqli_real_escape_string($tmp[1]);
+                $app    = mysqli_real_escape_string(preg_replace("/\(.*\).*$/","",$tmp[2]));
+                $para   = mysqli_real_escape_string(preg_replace("/^[^(]*\((.*)\)[^)]*$/", "$1", $tmp[2]));
                 $sql.= " ('".$context."','".$exten."','".$prio."','".$app."','".$para."'),";
             }
 
@@ -322,19 +314,19 @@
             /* Save current changes to the database */
             $query  = preg_replace("/%TABLENAME%/",$cfg['EXT_TABLE'],$sql);
             if($save){
-                $res    = @mysql_query($query,$r_con);
+                $res    = @mysqli_query($r_con,$query);
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query");
                 if(!$res){
-                    new log("debug","gofonmacro/".get_class($this),"",array(),@mysql_error($r_con));
+                    new log("debug","gofonmacro/".get_class($this),"",array(),@mysqli_error($r_con));
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>".$query."</b>", "ERROR");
-                    trigger_error(mysql_error($r_con));
+                    trigger_error(mysqli_error($r_con));
                     return(
                             sprintf(
                                 _("Macro could not be added to server '%s', please check database consistency!"), 
                                 $cfg['SERVER']));
                 }
             }
-            @mysql_close($r_con);
+            @mysqli_close($r_con);
         }
     }
 
--- a/gofon/gofon/phoneaccount/class_phoneAccount.inc
+++ b/gofon/gofon/phoneaccount/class_phoneAccount.inc
@@ -125,7 +125,7 @@
         $a_SETUP= array();
         if($this->is_account && isset($config->data['SERVERS']['FON']) &&
                 array_key_exists('FON',$config->data['SERVERS']) &&
-                is_callable("mysql_connect")
+                is_callable("mysqli_connect")
           ) {
 
             /* Servers defined? Watch here... */
@@ -148,13 +148,9 @@
                 }    
                 $cur_cfg = $this->goFonHomeServers[$this->goFonHomeServer];
 
-                $r_con =  @mysql_pconnect($cur_cfg['SERVER'],$cur_cfg['LOGIN'],$cur_cfg['PASSWORD']);
+                $r_con =  @mysqli_connect($cur_cfg['SERVER'],$cur_cfg['LOGIN'],$cur_cfg['PASSWORD'],$cur_cfg['DB']);
                 if(!$r_con){
-                    new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error());
-                }
-                $db  =  @mysql_select_db($cur_cfg['DB'],$r_con);
-                if(!$db){
-                    new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error());
+                    new log("debug","gofonreport/".get_class($this),"",array(),@mysqli_error());
                 }
 
                 $first = false; 
@@ -343,30 +339,24 @@
 
         $num = key($this->phoneNumbers);
 
-        if( (is_callable("mysql_pconnect"))&&
+        if( (is_callable("mysqli_connect"))&&
                 (isset($cur_cfg))&&
                 (isset($cur_cfg['SERVER']))&&
                 (isset($cur_cfg['LOGIN']))&&
                 (isset($cur_cfg['PASSWORD']))){
 
-            $r_con =  @mysql_pconnect($cur_cfg['SERVER'],$cur_cfg['LOGIN'],$cur_cfg['PASSWORD']);
+            $r_con =  @mysqli_connect($cur_cfg['SERVER'],$cur_cfg['LOGIN'],$cur_cfg['PASSWORD'],$cur_cfg['DB']);
             if($r_con){
 
-                // Try to select the gophone database
-                $r_db  =  @mysql_select_db($cur_cfg['DB'],$r_con);
-                if(!$r_db){
-                    msg_dialog::display(_("Warning"), msgPool::dbselect($cur_cfg['DB'],mysql_error()), WARNING_DIALOG);
-                }
-
                 $query_tmp = "SELECT ".$cur_cfg['VOICE_TABLE'].".context as 'v_context', 
                     ".$cur_cfg['SIP_TABLE'].".context, 
                     ".$cur_cfg['VOICE_TABLE'].".password 
                         FROM  ".$cur_cfg['VOICE_TABLE'].", 
                     ".$cur_cfg['SIP_TABLE']." 
-                        WHERE ".$cur_cfg['VOICE_TABLE'].".mailbox = ".mysql_real_escape_string($num)." 
-                        AND ".$cur_cfg['SIP_TABLE'].".name='".mysql_real_escape_string($this->uid)."'";
-                $res = mysql_query($query_tmp);
-                $vp  = mysql_fetch_assoc($res);
+                        WHERE ".$cur_cfg['VOICE_TABLE'].".mailbox = ".mysqli_real_escape_string($num)." 
+                        AND ".$cur_cfg['SIP_TABLE'].".name='".mysqli_real_escape_string($this->uid)."'";
+                $res = mysqli_query($r_con, $query_tmp);
+                $vp  = mysqli_fetch_assoc($res);
                 if(!isset($vp['context'])){
                     $this->is_modified= TRUE;
                     msg_dialog::display(_("Warning"), sprintf(_("Cannot identify telephone extension in database, please try to save again.")), WARNING_DIALOG);
@@ -386,8 +376,8 @@
         }
         $this->lastmacro=$this->macro;
 
-        if(is_callable("mysql_close")&&(isset($r_con))&&($r_con)){
-            @mysql_close($r_con) ;
+        if(is_callable("mysqli_close")&&(isset($r_con))&&($r_con)){
+            @mysqli_close($r_con) ;
         }
     }
 
@@ -399,29 +389,29 @@
         $ret =TRUE;
 
         // Connect to DB server
-        if( (is_callable("mysql_pconnect"))&&
+        if( (is_callable("mysqli_connect"))&&
                 (isset($config))&&
                 (isset($config['SERVER']))&&
                 (isset($config['LOGIN']))&&
-                (isset($config['PASSWORD']))){
+                (isset($config['PASSWORD']))&&
+                (isset($config['DB']))){
 
-            $r_con =  @mysql_pconnect($config['SERVER'],$config['LOGIN'],$config['PASSWORD']);
+            $r_con =  @mysqli_connect($config['SERVER'],$config['LOGIN'],$config['PASSWORD'],$config['DB']);
             if($r_con){
-                $r_db  =  @mysql_select_db($config['DB'],$r_con);
 
                 /* Validate Table Type - it must be InnoDB to be able to use transactions 
                  */
                 $inno_tables = array("SIP_TABLE","EXT_TABLE","VOICE_TABLE","QUEUE_TABLE","QUEUE_MEMBER_TABLE"); 
                 foreach($inno_tables as $inno_table){
-                    $sql = "show table status like '".mysql_real_escape_string($config[$inno_table])."';";
-                    $res = mysql_query($sql);
-                    $vp  = mysql_fetch_assoc($res);
+                    $sql = "show table status like '".mysqli_real_escape_string($config[$inno_table])."';";
+                    $res = mysqli_query($r_con, $sql);
+                    $vp  = mysqli_fetch_assoc($res);
                     if(!preg_match("/^InnoDB$/i",$vp['Engine'])){
 
                         /* Not an InnoDB Table type, try to modify type. 
                          */
                         $sql = "ALTER TABLE `".$config[$inno_table]."` ENGINE = INNODB; ";
-                        $res = mysql_query($sql);
+                        $res = mysqli_query($r_con, $sql);
                         if(!$res){
                             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>".$sql."</b>", 
                                     "<b>FAILED!</b>. Transactions will not work!");
@@ -462,7 +452,7 @@
      * If the phone hardware is 'automatic' the table entries will only be removed
      *  and not added. 
      */
-    function generate_mysql_entension_entries($save = false)
+    function generate_mysqli_entension_entries($save = false)
     {
         /* Check if there is at least one server available 
          * If not, return and tell the user that saving failed 
@@ -475,9 +465,9 @@
         }
 
         /* Check if Mysql extension is available */
-        if(!is_callable("mysql_pconnect")){
+        if(!is_callable("mysqli_connect")){
             if($save){
-                msg_dialog::display(_("Configuration error"), msgPool::missingext("php-mysql"), WARNING_DIALOG);
+                msg_dialog::display(_("Configuration error"), msgPool::missingext("php-mysqli"), WARNING_DIALOG);
             }
             return(true);
         }
@@ -491,7 +481,6 @@
         // Get Configuration for Mysql database Server
         $s_parameter    = "";                                           // Contains paramter for selected Macro 
         $r_con          = false;                                        // DB connection
-        $r_db           = false;                                        // Selected DB
         $r_res          = false;                                        // Result resource
         $a_ldap_attrs   = array();                                      //  
 
@@ -595,18 +584,11 @@
          * Get configuration to old asterisk home server 
          */ 
         $a_New = $this->goFonHomeServers[$this->goFonHomeServer];  // DB Configuration
-        $new_connection =  @mysql_pconnect($a_New['SERVER'],$a_New['LOGIN'],$a_New['PASSWORD']);
+        $new_connection =  @mysqli_connect($a_New['SERVER'],$a_New['LOGIN'],$a_New['PASSWORD'],$a_New['DB']);
         if(!$new_connection){
-            $this->generate_error =  msgPool::dbconnect($a_New['SERVER'],@mysql_error($new_connection),
+            $this->generate_error =  msgPool::dbconnect($a_New['SERVER'].":".$a_New['DB'],@mysqli_error($new_connection),
                     _("Abort saving entries to keep the database consistent."));
-            new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error($new_connection));
-            return false;
-        }
-        $new_database  =  @mysql_select_db($a_New['DB'],$new_connection);
-        if(!$new_database){
-            $this->generate_error =  msgPool::dbselect($a_New['DB'],@mysql_error($new_connection),
-                    _("Abort saving entries to keep the database consistent."));
-            new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error($new_connection));
+            new log("debug","gofonreport/".get_class($this),"",array(),@mysqli_error($new_connection));
             return false;
         }
 
@@ -620,18 +602,11 @@
 
             /* Create connection to the database that contains the old entry. 
              */
-            $old_connection =  @mysql_pconnect($a_Remove['SERVER'],$a_Remove['LOGIN'],$a_Remove['PASSWORD']);
+            $old_connection =  @mysqli_connect($a_Remove['SERVER'],$a_Remove['LOGIN'],$a_Remove['PASSWORD'],$a_Remove['DB']);
             if(!$old_connection){
-                $this->generate_error =  msgPool::dbconnect($a_Remove['SERVER'],@mysql_error($old_connection),
+                $this->generate_error =  msgPool::dbconnect($a_Remove['SERVER'].":".$a_Remove['DB'],@mysqli_error($old_connection),
                         _("Abort saving entries to keep the database consistent."));
-                new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error($old_connection));
-                return false;
-            }
-            $old_database  =  @mysql_select_db($a_Remove['DB'],$old_connection);
-            if(!$old_database){
-                $this->generate_error =  msgPool::dbselect($a_Remove['DB'],@mysql_error($old_connection),
-                        _("Abort saving entries to keep the database consistent."));
-                new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error($old_connection));
+                new log("debug","gofonreport/".get_class($this),"",array(),@mysqli_error($old_connection));
                 return false;
             }
         }
@@ -657,54 +632,54 @@
                             WARNING_DIALOG);
                 }
 
-                $query  = "SELECT id,name,callerid FROM ".$a_Remove['SIP_TABLE']." WHERE name='".mysql_real_escape_string($this->uid)."';";
-                $rid    = mysql_query($query,$old_connection);
+                $query  = "SELECT id,name,callerid FROM ".$a_Remove['SIP_TABLE']." WHERE name='".mysqli_real_escape_string($this->uid)."';";
+                $rid    = mysqli_query($old_connection,$query);
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, 
                         "<i>Reguest callerid to be able to identify the user.</i>");
 
                 /* Old entry found, remove it */
                 $query_a = array();
-                if(mysql_affected_rows($old_connection)){
-                    $result = mysql_fetch_assoc($rid);
+                if(mysqli_affected_rows($old_connection)){
+                    $result = mysqli_fetch_assoc($rid);
 
                     /* Set mode to strict
                        Strict disallows the addition of entries that do not match the targets field length.
                      */
                     $query_a[]= "SET @@sql_mode = STRICT_ALL_TABLES;";
-                    $query_a[]= "DELETE FROM ".$a_Remove['SIP_TABLE']." WHERE name='".mysql_real_escape_string($this->uid)."';";
-                    $query_a[]= "DELETE FROM ".$a_Remove['VOICE_TABLE']." WHERE customer_id='".mysql_real_escape_string($result['callerid'])."';";
-                    $query_a[]= "DELETE FROM ".$a_Remove['EXT_TABLE']." WHERE exten='".mysql_real_escape_string($this->uid)."';";
+                    $query_a[]= "DELETE FROM ".$a_Remove['SIP_TABLE']." WHERE name='".mysqli_real_escape_string($this->uid)."';";
+                    $query_a[]= "DELETE FROM ".$a_Remove['VOICE_TABLE']." WHERE customer_id='".mysqli_real_escape_string($result['callerid'])."';";
+                    $query_a[]= "DELETE FROM ".$a_Remove['EXT_TABLE']." WHERE exten='".mysqli_real_escape_string($this->uid)."';";
                     foreach($oldnums as $s_telenums) {
-                        $query_a[]= "DELETE FROM ".$a_Remove['EXT_TABLE']." WHERE exten='".mysql_real_escape_string($s_telenums)."';";
+                        $query_a[]= "DELETE FROM ".$a_Remove['EXT_TABLE']." WHERE exten='".mysqli_real_escape_string($s_telenums)."';";
                     }
 
                     /* Start transaction, to be able to rollback 
                      */
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Removing entry from old server---</b>","");
 
-                    mysql_query("begin;",$old_connection);
+                    mysqli_query($old_connection,"begin;");
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>begin;</b>","<i>Starting transaction!</i>");
 
                     foreach($query_a as $query){
                         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>".$query."</b>", "");
-                        if(!mysql_query($query,$old_connection)){
-                            $err = mysql_error($old_connection);
+                        if(!mysqli_query($old_connection,$query)){
+                            $err = mysqli_error($old_connection);
                             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"\n".$err, "<b>FAILED</b>");
                             msg_dialog::display(_("Error"), 
                                     msgPool::mysqlerror($err,__CLASS__)."&nbsp;".
                                     "\n<p>"._("Please activate debugging for details!")."</p>",
                                     ERROR_DIALOG);
 
-                            mysql_query("rollback;",$old_connection);
+                            mysqli_query($old_connection,"rollback;");
                             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>rollback;</b>", "<b>ERROR</b> Rollback transaction!");
-                            @mysql_close($old_connection);
+                            @mysqli_close($old_connection);
                             return(false);
                         } 
                     }
 
                     /* Let changes get active, everything was fine;
                      */ 
-                    mysql_query("commit;",$old_connection);
+                    mysqli_query($old_connection,"commit;");
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>commit;</b>", "");
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Transaction sucessful!---</b>", "");
                 }
@@ -737,15 +712,15 @@
              */
             $SQL_query_array[] = "SET @@sql_mode = STRICT_ALL_TABLES;";
 
-            $query = "SELECT * FROM ".$a_New['SIP_TABLE']." WHERE name='".mysql_real_escape_string($this->uid)."';\n"; 
-            $rid = mysql_query($query,$new_connection);
+            $query = "SELECT * FROM ".$a_New['SIP_TABLE']." WHERE name='".mysqli_real_escape_string($this->uid)."';\n"; 
+            $rid = mysqli_query($new_connection,$query);
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Receive current mysql entries.");
-            if(mysql_affected_rows($new_connection)){
+            if(mysqli_affected_rows($new_connection)){
 
                 /********************** 
                  * Update sip_users entry 
                  **********************/
-                $result                     = mysql_fetch_assoc($rid);
+                $result                     = mysqli_fetch_assoc($rid);
                 $sip_data_array['host']         = $s_host;
                 $sip_data_array['qualify']      = $s_qualify;
                 $sip_data_array['secret']       = $this->goFonPIN;
@@ -764,10 +739,10 @@
                 if(count($sip_data_array)){
                     $query = "UPDATE ".$a_New['SIP_TABLE']." SET ";
                     foreach($sip_data_array as $key => $val){
-                        $query.= "".$key."='".mysql_real_escape_string($val)."',"; 
+                        $query.= "".$key."='".mysqli_real_escape_string($val)."',"; 
                     } 
                     $query = preg_replace("/,$/","",$query);
-                    $query.= " WHERE name='".mysql_real_escape_string($this->uid)."';";
+                    $query.= " WHERE name='".mysqli_real_escape_string($this->uid)."';";
                     $SQL_query_array[] = $query;
                 }
             } else {
@@ -816,7 +791,7 @@
                  */
                 foreach($sip_data_array as $s_sip_key=>$s_sip_val){
                     if($s_sip_val === NULL) continue;
-                    $s_sip_values.="'".mysql_real_escape_string($s_sip_val)."',";
+                    $s_sip_values.="'".mysqli_real_escape_string($s_sip_val)."',";
                     $s_sip_keys  .="`".$s_sip_key."`,";
                 }
                 $s_sip_values =  preg_replace("/,$/","",$s_sip_values);
@@ -832,11 +807,11 @@
              **********************/
 
             $customer_id = $newnums[$i_new_key];
-            $query  = "SELECT id,name,callerid FROM ".$a_New['SIP_TABLE']." WHERE name='".mysql_real_escape_string($this->uid)."';";
-            $rid    = mysql_query($query,$new_connection);
+            $query  = "SELECT id,name,callerid FROM ".$a_New['SIP_TABLE']." WHERE name='".mysqli_real_escape_string($this->uid)."';";
+            $rid    = mysqli_query($new_connection,$query);
 
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Receive callerid");
-            $result = mysql_fetch_assoc($rid);
+            $result = mysqli_fetch_assoc($rid);
 
             $old_customer_id = ""; 
             if($result){
@@ -854,18 +829,18 @@
             $voice_data_array['pager']   = $this->pager;
 
             /* Check if there is already an entry in sip_users for this uid */
-            $query_tmp = "SELECT * FROM ".$a_New['VOICE_TABLE']." WHERE customer_id='".mysql_real_escape_string($old_customer_id)."';\n";
-            $rid = mysql_query($query_tmp,$new_connection);
+            $query_tmp = "SELECT * FROM ".$a_New['VOICE_TABLE']." WHERE customer_id='".mysqli_real_escape_string($old_customer_id)."';\n";
+            $rid = mysqli_query($query_tmp,$new_connection);
 
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query_tmp, "Check if voicemail entry exists");
-            if(mysql_affected_rows($new_connection)){
+            if(mysqli_affected_rows($new_connection)){
 
                 /********************** 
                  * Update Voice mail entry  
                  **********************/
 
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"", "<i>Voicemail entry exists, adding updating to queue.</i>");
-                $result = mysql_fetch_assoc($rid)  ;
+                $result = mysqli_fetch_assoc($rid)  ;
 
                 foreach($voice_data_array as $name => $value){
                     if($result[$name] == $value){
@@ -880,7 +855,7 @@
                         $query.= "".$key."='".$val."',"; 
                     } 
                     $query = preg_replace("/,$/","",$query);
-                    $query.= " WHERE customer_id='".mysql_real_escape_string($old_customer_id)."';";
+                    $query.= " WHERE customer_id='".mysqli_real_escape_string($old_customer_id)."';";
                     $SQL_query_array[] = $query;
                 }
             }else{
@@ -897,7 +872,7 @@
                 $s_voi_values = $s_voi_keys = "";
                 foreach($voice_data_array as $s_voi_key=>$s_voi_val){
                     if($s_voi_val === NULL) continue;
-                    $s_voi_values.="'".mysql_real_escape_string($s_voi_val)."',";
+                    $s_voi_values.="'".mysqli_real_escape_string($s_voi_val)."',";
                     $s_voi_keys  .="`".$s_voi_key."`,";
                 }
                 $s_voi_values =  preg_replace("/,$/","",$s_voi_values);
@@ -914,13 +889,13 @@
 
             /* Initiate transaction 
              */
-            $SQL_query_array[]= "DELETE FROM ".$a_New['EXT_TABLE']." WHERE exten=\"".mysql_real_escape_string($this->uid)."\";";
+            $SQL_query_array[]= "DELETE FROM ".$a_New['EXT_TABLE']." WHERE exten=\"".mysqli_real_escape_string($this->uid)."\";";
             $oldnums= array();
             foreach($oldnums as $s_telenums){
-                $SQL_query_array[]= "DELETE FROM ".$a_New['EXT_TABLE']." WHERE exten=\"".mysql_real_escape_string($s_telenums)."\";";
+                $SQL_query_array[]= "DELETE FROM ".$a_New['EXT_TABLE']." WHERE exten=\"".mysqli_real_escape_string($s_telenums)."\";";
             }
             foreach($newnums as $s_telenums){
-                $SQL_query_array[]= "DELETE FROM ".$a_New['EXT_TABLE']." WHERE exten=\"".mysql_real_escape_string($s_telenums)."\";";
+                $SQL_query_array[]= "DELETE FROM ".$a_New['EXT_TABLE']." WHERE exten=\"".mysqli_real_escape_string($s_telenums)."\";";
             }
 
             /********************** 
@@ -991,7 +966,7 @@
                 $SQL_syn = preg_replace("/,$/","",$SQL_syn);
                 $SQL_syn .= ") VALUES ("; 
                 foreach($entr as $key2 => $val2){
-                    $SQL_syn .= "'".mysql_real_escape_string($val2)."',";
+                    $SQL_syn .= "'".mysqli_real_escape_string($val2)."',";
                 }
                 $SQL_syn = preg_replace("/,$/","",$SQL_syn);
                 $SQL_syn .=");\n";
@@ -1004,33 +979,33 @@
              */
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Insert/Update new entry---</b>","");
 
-            mysql_query("begin;",$new_connection);
+            mysqli_query($new_connection,"begin;");
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>begin;</b>","<i>Starting transaction!</i>");
 
             foreach($SQL_query_array as $query){
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>".$query."</b>", "");
-                if(!mysql_query($query,$new_connection)){
-                    $err = mysql_error($new_connection);
+                if(!mysqli_query($new_connection,$query)){
+                    $err = mysqli_error($new_connection);
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"\n".$err, "<b>FAILED</b>");
                     msg_dialog::display(_("Error"), 
                             msgPool::mysqlerror($err,__CLASS__)."&nbsp;".
                             "\n<p>"._("Please activate debugging for details!")."</p>",
                             ERROR_DIALOG);
 
-                    mysql_query("rollback;",$new_connection);
+                    mysqli_query($new_connection,"rollback;");
                     @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>rollback;</b>", "<b>ERROR</b> Rollback transaction!");
-                    @mysql_close($new_connection);
+                    @mysqli_close($new_connection);
                     return(false);
                 } 
             }
 
             /* Let changes get active, everything was fine;
              */ 
-            mysql_query("commit;",$new_connection);
+            mysqli_query($new_connection,"commit;");
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>commit;</b>", "Perform transaction!");
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Transaction sucessful!---</b>", "");
         }
-        @mysql_close($new_connection);
+        @mysqli_close($new_connection);
         return true;
     }
 
@@ -1476,7 +1451,7 @@
         }
 
         if ($this->initially_was_account != $this->is_account || $this->is_modified){
-            $str = $this->generate_mysql_entension_entries(false);
+            $str = $this->generate_mysqli_entension_entries(false);
             if(empty($str)){
                 msg_dialog::display(_("Error"), $str, ERROR_DIALOG);
             }
@@ -1558,7 +1533,7 @@
 
         /*
          */
-        $str = $this->generate_mysql_entension_entries(true);
+        $str = $this->generate_mysqli_entension_entries(true);
         if(!$str){
             msg_dialog::display(_("Error"),_("An error occurred while updating the database entries!") , ERROR_DIALOG);
         }
@@ -1621,8 +1596,8 @@
         if(!$this->initially_was_account) return;
 
         // Check for MySQL extension
-        if(!is_callable("mysql_pconnect")){
-            msg_dialog::display(_("Configuration error"), msgPool::missingext("php-mysql"), WARNING_DIALOG);
+        if(!is_callable("mysqli_connect")){
+            msg_dialog::display(_("Configuration error"), msgPool::missingext("php-mysqli"), WARNING_DIALOG);
             return(FALSE);
         }
 
@@ -1650,22 +1625,12 @@
         }
 
         // Connect to DB server
-        $r_con =  @mysql_pconnect($a_SETUP['SERVER'],$a_SETUP['LOGIN'],$a_SETUP['PASSWORD']);
+        $r_con =  @mysqli_connect($a_SETUP['SERVER'],$a_SETUP['LOGIN'],$a_SETUP['PASSWORD'],$a_SETUP['DB']);
 
         // Check if we are  connected correctly
         if(!$r_con){
-            msg_dialog::display(_("Error"), msgPool::dbconnect("GOfon",@mysql_error()), ERROR_DIALOG);
-            new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error());
-            return false;
-        }
-
-        // Select database for Extensions
-        $db  =  @mysql_select_db($a_SETUP['DB'],$r_con);
-
-        // Test if we have the database selected correctly
-        if(!$db){
-            msg_dialog::display(_("Error"), msgPool::dbselect("GOfon", @mysql_error()), ERROR_DIALOG);
-            new log("debug","gofonreport/".get_class($this),"",array(),@mysql_error());
+            msg_dialog::display(_("Error"), msgPool::dbconnect("GOfon",@mysqli_error()), ERROR_DIALOG);
+            new log("debug","gofonreport/".get_class($this),"",array(),@mysqli_error());
             return false;
         }
 
@@ -1678,14 +1643,14 @@
             if(!$first_num){
                 $first_num = $s_telenums;
             }
-            $SQL[] = "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".mysql_real_escape_string($s_telenums)."';\n";
+            $SQL[] = "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".mysqli_real_escape_string($s_telenums)."';\n";
         }
 
 
-        $query  = "SELECT id,name,callerid FROM ".$a_SETUP['SIP_TABLE']." WHERE name='".mysql_real_escape_string($this->uid)."';";
-        $rid    = mysql_query($query,$r_con);
+        $query  = "SELECT id,name,callerid FROM ".$a_SETUP['SIP_TABLE']." WHERE name='".mysqli_real_escape_string($this->uid)."';";
+        $rid    = mysqli_query($r_con,$query);
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,$query, "Database query");
-        $result = mysql_fetch_assoc($rid);
+        $result = mysqli_fetch_assoc($rid);
         $callerid = $first_num;
         if($result){
             $callerid = $result['callerid'];
@@ -1694,38 +1659,38 @@
         /* Set mode to strict
            Strict disallows the addition of entries that do not match the targets field length.
          */
-        $SQL[] = "DELETE FROM ".$a_SETUP['VOICE_TABLE']." WHERE customer_id='".mysql_real_escape_string($callerid)."';";
-        $SQL[] = "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".mysql_real_escape_string($this->uid)."';\n";
-        $SQL[] = "DELETE FROM ".$a_SETUP['SIP_TABLE']." WHERE name='".mysql_real_escape_string($this->uid)."';\n";
+        $SQL[] = "DELETE FROM ".$a_SETUP['VOICE_TABLE']." WHERE customer_id='".mysqli_real_escape_string($callerid)."';";
+        $SQL[] = "DELETE FROM ".$a_SETUP['EXT_TABLE']." WHERE exten='".mysqli_real_escape_string($this->uid)."';\n";
+        $SQL[] = "DELETE FROM ".$a_SETUP['SIP_TABLE']." WHERE name='".mysqli_real_escape_string($this->uid)."';\n";
 
         /* Start transaction, to be able to rollback
          */
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Removing entry from server---</b>","");
 
-        mysql_query("begin;",$r_con);
+        mysqli_query($r_con,"begin;");
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>begin;</b>","<i>Starting transaction!</i>");
 
         foreach($SQL as $query){
             @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>".$query."</b>", "");
 
-            if(!mysql_query($query,$r_con)){
-                $err = mysql_error($r_con);
+            if(!mysqli_query($r_con,$query)){
+                $err = mysqli_error($r_con);
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"\n".$err, "<b>FAILED</b>");
                 msg_dialog::display(_("Error"),
                         msgPool::mysqlerror($err,__CLASS__)."&nbsp;".
                         "\n<p>"._("Please activate debugging for details!")."</p>",
                         ERROR_DIALOG);
 
-                mysql_query("rollback;",$r_con);
+                mysqli_query($r_con,"rollback;");
                 @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>rollback;</b>", "<b>ERROR</b> Rollback transaction!");
-                @mysql_close($r_con);
+                @mysqli_close($r_con);
                 return(false);
             }
         }
 
         /* Let changes get active, everything was fine;
          */
-        mysql_query("commit;",$r_con);
+        mysqli_query($r_con,"commit;");
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>commit;</b>", "");
         @DEBUG (DEBUG_MYSQL, __LINE__, __FUNCTION__, __FILE__,"<b>---Transaction sucessful!---</b>", "");
 
@@ -1769,7 +1734,7 @@
         }
 
         /* Optionally execute a command after we're done */
-        @mysql_close($r_con);
+        @mysqli_close($r_con);
         $this->handle_post_events('remove',array("uid"=> $this->uid));
     }
 
--- a/rsyslog/addons/rsyslog/class_rsyslog.inc
+++ b/rsyslog/addons/rsyslog/class_rsyslog.inc
@@ -53,23 +53,18 @@
     }
 
     // Check for installed mysql extension, if missing abort
-    $this->mysql_extension_installed = is_callable("mysql_connect");
-    if(!$this->mysql_extension_installed) return;
+    $this->mysqli_extension_installed = is_callable("mysqli_connect");
+    if(!$this->mysqli_extension_installed) return;
 
     // Test server connetivity 
     $ui = get_userinfo();
     foreach($this->servers as $name => $server)  
     {
-      $link = @mysql_pconnect($server['cn'], $server['User'], $server['Password']);
+      $link = @mysqli_connect($server['cn'], $server['User'], $server['Password'], $server['Database']);
       if ($link === FALSE){
-        new log("debug","gosa_logging","dbconnect",array(),@mysql_error());
+        new log("debug","gosa_logging","dbconnect",array(),@mysqli_error());
         $this->servers[$name]['status'] = "connectfailed";
-        $this->servers[$name]['error']  = @mysql_error();
-        continue;
-      }elseif (! @mysql_select_db($server['Database'])){
-        new log("debug","gosa_logging","selectdb",array(),@mysql_error());
-        $this->servers[$name]['status'] = "dbmissing";
-        $this->servers[$name]['error']  = @mysql_error();
+        $this->servers[$name]['error']  = @mysqli_error();
         continue;
       }else{
         $this->servers[$name]['status'] = "ok";
@@ -81,24 +76,24 @@
         // Get list of Hosts using this log server..
         if(preg_match('/r/', $this->servers[$name]['ACL'])){
           $query = "SELECT distinct(FromHost) FROM SystemEvents;";
-          $res = @mysql_query($query, $link);
+          $res = @mysqli_query($link,$query);
           if($res){
-            while($attrs = @mysql_fetch_assoc($res)){
+            while($attrs = @mysqli_fetch_assoc($res)){
               $this->servers[$name]['Hosts'][$attrs['FromHost']] = $attrs['FromHost'];  
             }
           }else{
             $this->servers[$name]['status'] = "query_failed";
-            $this->servers[$name]['error']  = @mysql_error();
+            $this->servers[$name]['error']  = @mysqli_error();
           }
           $query = "SELECT distinct(Priority) FROM SystemEvents ORDER BY Priority;";
-          $res = @mysql_query($query, $link);
+          $res = @mysqli_query($link, $query);
           if($res){
-            while($attrs = @mysql_fetch_assoc($res)){
+            while($attrs = @mysqli_fetch_assoc($res)){
               $this->servers[$name]['Priorities'][$attrs['Priority']] = $attrs['Priority'];  
             }
           }else{
             $this->servers[$name]['status'] = "query_failed";
-            $this->servers[$name]['error']  = @mysql_error();
+            $this->servers[$name]['error']  = @mysqli_error();
           }
         }
       }
@@ -163,15 +158,11 @@
     {
         $result = array();
         foreach($this->servers as $name => $server){
-            $link = @mysql_pconnect($server['cn'], $server['User'], $server['Password']);
+            $link = @mysqli_connect($server['cn'], $server['User'], $server['Password'], $server['Database']);
             if ($link === FALSE){
-                new log("debug","gosa_logging","dbconnect",array(),@mysql_error());
+                new log("debug","gosa_logging","dbconnect",array(),@mysqli_error());
                 $this->servers[$name]['status'] = "connectfailed";
-                $this->servers[$name]['error']  = @mysql_error();
-            }elseif (! @mysql_select_db($server['Database'])){
-                new log("debug","gosa_logging","selectdb",array(),@mysql_error());
-                $this->servers[$name]['status'] = "dbmissing";
-                $this->servers[$name]['error']  = @mysql_error();
+                $this->servers[$name]['error']  = @mysqli_error();
             }else{
                 $this->servers[$name]['status'] = "ok";
                 $this->servers[$name]['error']  = "";
@@ -179,9 +170,9 @@
 
             if($link){
                 $query = "SELECT * FROM SystemEvents WHERE Message like '%GOsa%' ORDER BY ID DESC LIMIT 50";
-                $res = mysql_query($query, $link);
+                $res = mysqli_query($link, $query);
                 if($res){
-                    while($attrs = mysql_fetch_assoc($res)){
+                    while($attrs = mysqli_fetch_assoc($res)){
                         $result[] = $attrs; 
                     }
                 }
@@ -237,15 +228,11 @@
 
 
     $server = $this->servers[$name];
-    $link = @mysql_pconnect($server['cn'], $server['User'], $server['Password']);
+    $link = @mysqli_connect($server['cn'], $server['User'], $server['Password'], $server['Database']);
     if ($link === FALSE){
-      new log("debug","gosa_logging","dbconnect",array(),@mysql_error());
+      new log("debug","gosa_logging","dbconnect",array(),@mysqli_error());
       $this->servers[$name]['status'] = "connectfailed";
-      $this->servers[$name]['error']  = @mysql_error();
-    }elseif (! @mysql_select_db($server['Database'])){
-      new log("debug","gosa_logging","selectdb",array(),@mysql_error());
-      $this->servers[$name]['status'] = "dbmissing";
-      $this->servers[$name]['error']  = @mysql_error();
+      $this->servers[$name]['error']  = @mysqli_error();
     }else{
       $this->servers[$name]['status'] = "ok";
       $this->servers[$name]['error']  = "";
@@ -261,27 +248,27 @@
 
       $filter = "FROM SystemEvents WHERE 1=1 ";
       if($host != "%%"){
-        $filter.= " AND FromHost like '".mysql_real_escape_string($host)."' ";
+        $filter.= " AND FromHost like '".mysqli_real_escape_string($host)."' ";
       }
       if($prio != "%%"){
-        $filter.= "AND Priority like '".mysql_real_escape_string($prio)."' ";
+        $filter.= "AND Priority like '".mysqli_real_escape_string($prio)."' ";
       }
       $filter.= "AND DeviceReportedTime >= '".(date("Y.m.d 00:00:00", strtotime($this->startTime)))."' ";     
       $filter.= "AND DeviceReportedTime <= '".(date("Y.m.d 23:59:59", strtotime($this->stopTime)))."' ";     
 
       if(!empty($this->search_for)){
-          $filter.= "AND ( ( SysLogTag like '%".mysql_real_escape_string($this->search_for).
-              "%' ) OR  ( Message like '%".mysql_real_escape_string($this->search_for)."%' ) ) ";
+          $filter.= "AND ( ( SysLogTag like '%".mysqli_real_escape_string($this->search_for).
+              "%' ) OR  ( Message like '%".mysqli_real_escape_string($this->search_for)."%' ) ) ";
       }
 
       // Detect amount of matching entries 
       $query = "SELECT count(ID) as `amount` ".$filter;
-      $res = @mysql_query($query, $link);
-      if($res && $attrs = @mysql_fetch_assoc($res)){ 
+      $res = @mysqli_query($link, $query);
+      if($res && $attrs = @mysqli_fetch_assoc($res)){ 
         $result['count'] = $attrs['amount'];
       }else{
         $this->servers[$name]['status'] = "query_failed";
-        $this->servers[$name]['error']  = @mysql_error();
+        $this->servers[$name]['error']  = @mysqli_error();
       }
 
       if($result['count']){
@@ -296,9 +283,9 @@
         }
 
         $query = "SELECT * ".$filter;
-        $res = mysql_query($query, $link);
+        $res = mysqli_query($query, $link);
         if($res){
-          while($attrs = @mysql_fetch_assoc($res)){
+          while($attrs = @mysqli_fetch_assoc($res)){
             $attrs['DeviceReportedTime']= $this->time2local($attrs['DeviceReportedTime']);
             $attrs['Facility']= $this->facility2string($attrs['Facility']);
             $attrs['Priority']= $this->severity2string($attrs['Priority']);
@@ -314,7 +301,7 @@
           $this->servers[$name]['error']  = "";
         }else{
           $this->servers[$name]['status'] = "query_failed";
-          $this->servers[$name]['error']  = @mysql_error();
+          $this->servers[$name]['error']  = @mysqli_error();
         }
       }
     }
--- a/gosa-core/include/functions_debug.inc
+++ b/gosa-core/include/functions_debug.inc
@@ -30,7 +30,7 @@
 **   
 **   
 ** print_result( result_handle )
-**   prints a mysql_result set returned by mysql_query() as a table
+**   prints a mysqli_result set returned by mysqli_query() as a table
 **   this function is work in progress! use at your own risk
 **
 **
@@ -236,10 +236,10 @@
 	
 	if(!$RESULT) return;
 	
-	$fieldcount = mysql_num_fields($RESULT);
+	$fieldcount = mysqli_num_fields($RESULT);
 	
 	for($i=0; $i<$fieldcount; $i++) {
-		$tables[mysql_field_table($RESULT, $i)]++;
+		$tables[mysqli_field_table($RESULT, $i)]++;
 	}
 	
 	print '
@@ -286,16 +286,16 @@
 	print '</tr>';
 	
 	print '<tr>';
-	for($i=0;$i < mysql_num_fields($RESULT);$i++) {
-		$FIELD = mysql_field_name($RESULT, $i);
+	for($i=0;$i < mysqli_num_fields($RESULT);$i++) {
+		$FIELD = mysqli_field_name($RESULT, $i);
 		$col == '0054A6' ? $col = '003471' : $col = '0054A6';
 		print '<td align="center" bgcolor="#'.$col.'" class="rs_f_th">'.$FIELD.'</td>';
 	}
 	print '</tr>';
 
-	mysql_data_seek($RESULT, 0);
+	mysqli_data_seek($RESULT, 0);
 
-	while($DB_ROW = mysql_fetch_array($RESULT, MYSQL_NUM)) {
+	while($DB_ROW = mysqli_fetch_array($RESULT, MYSQL_NUM)) {
 		$pointer++;
 		if($toggle) {
 			$col1 = "E6E6E6";
@@ -313,7 +313,7 @@
 		print '</tr>';
 	}
 	print '</table>';
-	mysql_data_seek($RESULT, 0);
+	mysqli_data_seek($RESULT, 0);
 }
 
 function _script_globals() {
--- a/gosa-core/include/utils/class_msgPool.inc
+++ b/gosa-core/include/utils/class_msgPool.inc
@@ -143,18 +143,6 @@
   }
 
 
-  public static function dbselect($name, $error= "", $dbinfo= "")
-  {
-    if ($error != ""){
-      $error= "<br><br>"._("Error").": ".bold($error);
-    }
-    if ($dbinfo != ""){
-      $error.= "<br><br>"._("Connection information").": ".bold($dbinfo);
-    }
-    return (sprintf(_("Cannot select %s database!"), bold($name)).$error);
-  }
-
-
   public static function noserver($name)
   {
     return (sprintf(_("No %s server defined!"), bold($name)));
--- a/gosa-core/setup/class_setupStep_Checks.inc
+++ b/gosa-core/setup/class_setupStep_Checks.inc
@@ -138,7 +138,7 @@
     $N = msgPool::checkingFor(_("MySQL"));
     $D = _("GOsa requires this module to communicate with several supported databases.");
     $S = msgPool::installPhpModule("MySQL");
-    $R = is_callable("mysql_query");
+    $R = is_callable("mysqli_query");
     $M = TRUE;
     $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M );
 
--- a/gofax/html/getfax.php
+++ b/gofax/html/getfax.php
@@ -47,23 +47,20 @@
 restore_error_handler();
 
 $cfg= $config->data['SERVERS']['FAX'];
-$link = mysql_pconnect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD'])
+$link = mysqli_connect($cfg['SERVER'], $cfg['LOGIN'], $cfg['PASSWORD'], 'gofax')
                   or die(_("Could not connect to database server!"));
 
-mysql_select_db("gofax") or die(_("Could not select database!"));
-
-
 /* Permission to view? */
 $query = "SELECT id,uid FROM faxlog WHERE id = '".validate(stripcslashes($_GET['id']))."'";
-$result = mysql_query($query) or die(_("Database query failed!"));
-$line = mysql_fetch_array($result, MYSQL_ASSOC);
+$result = mysqli_query($link, $query) or die(_("Database query failed!"));
+$line = mysqli_fetch_array($result, MYSQL_ASSOC);
 
 $query = "SELECT id,fax_data FROM faxdata WHERE id = '".validate(stripcslashes($_GET['id']))."'";
-$result = mysql_query($query) or die(_("Database query failed!"));
+$result = mysqli_query($link, $query) or die(_("Database query failed!"));
 
 /* Load pic */
-$data = mysql_result ($result, 0, "fax_data");
-mysql_close ($link);
+$data = mysqli_result ($result, 0, "fax_data");
+mysqli_close ($link);