Fixed CLang warning messages and other

[opengatem/opengatem.git] / phpsrc / sendreportmail.php

diff --git a/phpsrc/sendreportmail.php b/phpsrc/sendreportmail.php
index 75bb6c0..11a7e7a 100755 (executable)
--- a/phpsrc/sendreportmail.php
+++ b/phpsrc/sendreportmail.php
@@ -29,18 +29,18 @@ if(!$link)return;
 
 // get mail address and others from mysql db
 if(!(list($device, $mailAddress)=getDataFromMysql($macAddress))){
-       mysql_close($link);
+       mysqli_close($link);
        return;
 }
 
 // if recent report exists, skip to send report
-if(skipReporting($macAddress, $gatewayName, $reportInterval)){
-       mysql_close($link);
+if(skipReporting($link, $macAddress, $gatewayName, $reportInterval)){
+       mysqli_close($link);
        return;
 }
 
 // close database
-mysql_close($link);
+mysqli_close($link);
 
 // send mail to the user
 sendMailToUser($mailSender, $mailAddress, $device, $gatewayName, 
@@ -82,19 +82,19 @@ prepare mysql connection
 function prepareMysql($mysqlServer, $mysqlUser, $mysqlPassword){
 
        // connect and access to MySql DB
-       $link = mysql_connect($mysqlServer, $mysqlUser, $mysqlPassword);
+       $link = mysqli_connect($mysqlServer, $mysqlUser, $mysqlPassword);
        if (!$link){
-               syslog(LOG_INFO, 'ERR: Cannot connect DB '.mysql_error());
+               syslog(LOG_INFO, 'ERR: Cannot connect DB '.mysqli_error());
                return FALSE;
        }
 
        // use opengatem database
-       $db_selected = mysql_select_db('opengatem', $link);
+       $db_selected = mysqli_select_db($link, 'opengatem');
        if (!$db_selected){
-               syslog(LOG_INFO, 'ERR: Cannot select DB '.mysql_error());
+               syslog(LOG_INFO, 'ERR: Cannot select DB '.mysqli_error());
                return FALSE;
        }
-       mysql_set_charset('utf8');
+       mysqli_set_charset($link, 'utf8');
        return $link;
 }
 
@@ -106,15 +106,15 @@ function getDataFromMysql($macAddress){
        $mailAddress="?";
 
        // query
-       $result = mysql_query('SELECT device, mailAddress FROM macaddrs 
+       $result = mysqli_query($link, 'SELECT device, mailAddress FROM macaddrs 
                WHERE macAddress="'.$macAddress.'" AND status!="D"');
        if (!$result){
-               syslog(LOG_INFO, 'ERR: Fail DB query '.mysql_error());
+               syslog(LOG_INFO, 'ERR: Fail DB query '.mysqli_error());
                return FALSE;
        }
 
        // get result
-       if($row = mysql_fetch_row($result)){
+       if($row = mysqli_fetch_row($result)){
                $device = $row[0];
                $mailAddress = $row[1];
        }else{
@@ -130,10 +130,10 @@ to avoid to send too many mails,
 skip if there are recent logs having same macaddress, and same gateway 
 PLEASE MODIFY to control the report frequency.
 ***/
-function skipReporting($macAddress, $gatewayName, $reportInterval){
+function skipReporting($link, $macAddress, $gatewayName, $reportInterval){
        
        // query
-       $result = mysql_query('SELECT count(*) FROM sessionmd '
+       $result = mysqli_query($link, 'SELECT count(*) FROM sessionmd '
                .'WHERE EXISTS (SELECT * FROM sessionmd '
                .'WHERE macAddress="'.$macAddress.'" '
                .'AND gatewayName LIKE "'.$gatewayName.'.%" '
@@ -143,12 +143,12 @@ function skipReporting($macAddress, $gatewayName, $reportInterval){
                );
 
        if (!$result){
-               syslog(LOG_INFO, 'ERR: Fail query '.mysql_error());
+               syslog(LOG_INFO, 'ERR: Fail query '.mysqli_error());
                return TRUE;
        }
 
        // get data
-       if($row = mysql_fetch_row($result)) $count = $row[0];
+       if($row = mysqli_fetch_row($result)) $count = $row[0];
        else    $count = 0;
 
        // if recent logs exist, skip is true