Ticket #42857: patch-base.diff

base_db_common.php

@@ -80 +80 @@
             " "._ERRPHPERROR2."</FONT>";
   }
 
-  if ( ($DBtype == "mysql") || ($DBtype == "mysqlt") )
+  if ( ($DBtype == "mysql") || ($DBtype == "mysqlt") || ($DBtype == "mysqli"))
   {
      if ( !(function_exists("mysql_connect")) )
      {

base_graph_display.php

@@ -114 +114 @@
   else
   { 
     // Create the graph area, legends on bottom -- Alejandro
-    $Graph =& new Image_Graph(array('driver'=>'gd', 
+    $Graph = new Image_Graph(array('driver'=>'gd',
                                     'width'=>$width,
                                     'height'=>$height));
   }
@@ -320 +320 @@
 
       // special case '"I0" => "private network (rfc 1918)"' and
       // '"** (private network) " => "private network (rfc 1918)"'
-      if (ereg("rfc 1918", $tmp, $substring) || (ereg("[*][*] \(private network\) ", $tmp_lower, $substring)))
+      if (preg_match("/rfc 1918/", $tmp, $substring) || (preg_match("/[*][*] \(private network\) /", $tmp_lower, $substring)))
       {
         $Dataset->addPoint("private network (rfc 1918)", $xdata[$i][1]);
       }
       // special case '?? (Not Found) ' => 'unknown'
-      elseif(ereg("[?][?][ \t]+\(Not Found\)[ \t]*", $tmp, $substring))
+      elseif(preg_match("/[?][?][ \t]+\(Not Found\)[ \t]*/", $tmp, $substring))
       {
         $Dataset->addPoint("unknown", $xdata[$i][1]);
       }
       // anything inside parentheses, following a 2-letter TLD:
-      elseif (ereg("^[-a-zA-Z0-9]{2}[ \t]\((.+)\)[ \t]*$", $tmp, $substring))
+      elseif (preg_match("/^[-a-zA-Z0-9]{2}[ \t]\((.+)\)[ \t]*$/", $tmp, $substring))
       {
         $Dataset->addPoint($substring[1], $xdata[$i][1]);
       }
       // anything after two-letter top level domain names and after one space or tab:
-      elseif (ereg("[ \t]*[-a-zA-Z0-9]{2}[ \t]([-a-zA-Z0-9]+[-a-zA-Z0-9 ]*)", $tmp, $substring))
+      elseif (preg_match("/[ \t]*[-a-zA-Z0-9]{2}[ \t]([-a-zA-Z0-9]+[-a-zA-Z0-9 ]*)/", $tmp, $substring))
       {
         $Dataset->addPoint($substring[1], $xdata[$i][1]);
       }
       // two-letter top level domain names right at the beginning:
-      elseif (ereg("[ \t]*([-a-zA-Z0-9]{2})[ \t]", $tmp_lower, $substring))
+      elseif (preg_match("/[ \t]*([-a-zA-Z0-9]{2})[ \t]/", $tmp_lower, $substring))
       {
         $Dataset->addPoint($substring[1], $xdata[$i][1]);
       }

base_qry_common.php

@@ -773 +773 @@
            }
         }
         /* if have chosen the address type to be both source and destination */
-        if ( ereg("ip_both", $tmp) )
+        if ( preg_match("/ip_both/", $tmp) )
         {
-           $tmp_src = ereg_replace("ip_both","ip_src",$tmp);
-           $tmp_dst = ereg_replace("ip_both","ip_dst",$tmp);
+           $tmp_src = preg_replace("/ip_both/","ip_src",$tmp);
+           $tmp_dst = preg_replace("/ip_both/","ip_dst",$tmp);
            
            if ( $ip_addr[$i][2] == '=' )
              $tmp = "(".$tmp_src.') OR ('.$tmp_dst.')';

base_qry_sqlcalls.php

@@ -259 +259 @@
            $line = split (" ", $current_sig_txt);
            foreach ($line as $ps_element) 
            {
-             if ( ereg("[0-9]*\.[0-9]*\.[0-9]*\.[0-9]", $ps_element)  )
+             if ( preg_match("/[0-9]*\.[0-9]*\.[0-9]*\.[0-9]/", $ps_element)  )
              {
-                $ps_element = ereg_replace (":", "", $ps_element);
+                $ps_element = preg_replace ("/:/", "", $ps_element);
                 qroPrintEntry("<A HREF=\"base_stat_ipaddr.php?ip=".$ps_element."&amp;netmask=32\">".
                               $ps_element."</A>");
              }

base_stat_common.php

@@ -312 +312 @@
    if (!stristr($where, "WHERE") && $where != "")
         $where = " WHERE $where ";
 
-   if ( $db->DB_type == "mysql" )
+   if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli" )
    {
      if ( $join == "" && $where == "")
        $result = $db->baseExecute("SELECT COUNT(DISTINCT acid_event.ip_src, acid_event.ip_dst, acid_event.ip_proto) FROM acid_event");

base_stat_ipaddr.php

@@ -135 +135 @@
    print "</PRE><BR>\n";
    */
 
-   if(ereg($ip, $contents)) {
+   if(preg_match("/$ip/", $contents)) {
      $total++;
      if( $total % 2 == 0 ) {
         $color="DDDDDD";
@@ -143 +143 @@
         $color="FFFFFF";
      }
 
-     $contents = ereg_replace("  ", " ", $contents);
+     $contents = preg_replace("/  /", " ", $contents);
      $elements = explode(" ", $contents);
 
      echo '<tr bgcolor="'.$color.'"><td align="center">'.
@@ -183 +183 @@
      print "</PRE></TD>";
 
      /*
-     ereg("([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)",$elements[3],$store);
+     preg_match("/([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)/",$elements[3],$store);
      $source_ip = $store[1];
      $source_port = $store[2];
      if (empty($source_ip))
@@ -197 +197 @@
      echo '<td align="center">' . $source_ip  . '</td>';
      echo '<td align="center">' . $source_port . '</td>';
 
-     ereg("([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)",$elements[5],$store);
+     preg_match("/([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*):([0-9]*)/",$elements[5],$store);
      $destination_ip = $store[1];
      $destination_port = $store[2];
      if (empty($destination_ip))

includes/base_db.inc.php

@@ -77 +77 @@
   {
      GLOBAL $sql_trace_mode, $sql_trace_file;
  
-     $this->DB = NewADOConnection();
+     // If they have mysqli, use it. Otherwise, fall back to the older "mysql" extension.
+     if ($this->DB_type == 'mysql') {
+         if (extension_loaded('mysqli')) {
+             $this->DB_type = 'mysqli';
+         } else {
+             $this->DB_type = 'mysql';
+         }
+     }
+
+     $this->DB = NewADOConnection($this->DB_type);
      $this->DB_name = $database;
      $this->DB_host = $host;
      $this->DB_port = $port;
@@ -108 +117 @@
 
      /* Set the database schema version number */
      $sql = "SELECT vseq FROM schema";
-     if ($this->DB_type == "mysql") $sql = "SELECT vseq FROM `schema`"; 
+     if ($this->DB_type == "mysql" || $this->DB_type == "mysqli") $sql = "SELECT vseq FROM `schema`"; 
      if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
 
      $result = $this->DB->Execute($sql);
@@ -138 +147 @@
   function basePConnect($database, $host, $port, $username, $password)
   {
      GLOBAL $sql_trace_mode, $sql_trace_file; 
+     
+     // If they have mysqli, use it. Otherwise, fall back to the older "mysql" extension.
+     if ($this->DB_type == 'mysql') {
+         if (extension_loaded('mysqli')) {
+             $this->DB_type = 'mysqli';
+         } else {
+             $this->DB_type = 'mysql';
+         }
+     }
 
-     $this->DB = NewADOConnection();
+     $this->DB = NewADOConnection($this->DB_type);
      $this->DB_name = $database;
      $this->DB_host = $host;
      $this->DB_port = $port;
@@ -171 +189 @@
      /* Set the database schema version number */
      $sql = "SELECT vseq FROM schema"; 
      if ($this->DB_type == "mssql") $sql = "SELECT vseq FROM [schema]";
-     if ($this->DB_type == "mysql") $sql = "SELECT vseq FROM `schema`";
+     if ($this->DB_type == "mysql" || $this->DB_type == "mysqli") $sql = "SELECT vseq FROM `schema`";
 
      $result = $this->DB->Execute($sql);
      if ( $this->baseErrorMessage() != "" )
@@ -209 +227 @@
      /* ** Begin DB specific SQL fix-up ** */
      if ($this->DB_type == "mssql")
      {
-        $sql = eregi_replace("''", "NULL", $sql);
+        $sql = preg_replace("/''/i", "NULL", $sql);
      }
 
      if ($this->DB_type == "oci8")
@@ -231 +249 @@
         $rs = new baseRS($this->DB->Execute($sql), $this->DB_type);
      else
      {
-        if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || 
+        if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
              ($this->DB_type == "maxsql") )
         {
            $rs =  new baseRS($this->DB->Execute($sql." LIMIT ".$start_row.", ".$num_rows),
@@ -321 +339 @@
    * the current point, so it can't be here and needs to be in the actual script after calling this function
    *  -- srh (02/01/2001)
    */
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || 
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
           ($this->DB_type == "maxsql") || ($this->DB_type == "mssql"))
         return $this->DB->Insert_ID();
      else if ($this->DB_type == "postgres" ||($this->DB_type == "oci8"))
@@ -336 +354 @@
 
   function baseSQL_YEAR($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || 
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
           ($this->DB_type == "maxsql") || ($this->DB_type == "mssql") )
         return " YEAR($func_param) $op $timestamp ";
      else if( $this->DB_type == "oci8" )
@@ -347 +365 @@
 
   function baseSQL_MONTH($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || 
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") ||
           ($this->DB_type == "maxsql") || ($this->DB_type == "mssql") )
         return " MONTH($func_param) $op $timestamp ";
      else if( $this->DB_type == "oci8" )
@@ -358 +376 @@
 
   function baseSQL_DAY($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
         return " DAYOFMONTH($func_param) $op $timestamp ";
      else if($this->DB_type == "oci8")
         return " to_number( to_char( $func_param, 'DD' ) ) $op $timestamp ";
@@ -370 +388 @@
 
   function baseSQL_HOUR($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
         return " HOUR($func_param) $op $timestamp ";
      else if($this->DB_type == "oci8")
         return " to_number( to_char( $func_param, 'HH' ) ) $op $timestamp ";
@@ -382 +400 @@
 
   function baseSQL_MINUTE($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
         return " MINUTE($func_param) $op $timestamp ";
      else if($this->DB_type == "oci8")
         return " to_number( to_char( $func_param, 'MI' ) ) $op $timestamp ";
@@ -394 +412 @@
 
   function baseSQL_SECOND($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
         return " SECOND($func_param) $op $timestamp ";
      else if($this->DB_type == "oci8")
         return " to_number( to_char( $func_param, 'SS' ) ) $op $timestamp ";
@@ -406 +424 @@
 
   function baseSQL_UNIXTIME($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
      {
         return " UNIX_TIMESTAMP($func_param) $op $timestamp ";
      }
@@ -432 +450 @@
 
   function baseSQL_TIMESEC($func_param, $op, $timestamp)
   {
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") )
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") )
         return " TIME_TO_SEC($func_param) $op $timestamp ";
      else if($this->DB_type == "oci8")
         return " to_number( $func_param ) $op $timestamp ";
@@ -549 +567 @@
  
      // Is This if statement necessary?  -- Kevin
      /* MS SQL Server 7, MySQL, Sybase, and Postgres natively support this function */ 
-     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "maxsql") ||
+     if ( ($this->DB_type == "mysql") || ($this->DB_type == "mysqlt") || ($this->DB_type == "mysqli") || ($this->DB_type == "maxsql") ||
           ($this->DB_type == "mssql") || ($this->DB_type == "sybase") || ($this->DB_type == "postgres") || ($this->DB_type == "oci8"))
         return $this->row->RecordCount();
 
@@ -623 +641 @@
   if ( !(
           ($type == "mysql") ||
           ($type == "mysqlt") ||
+          ($type == "mysqli") ||
           ($type == "maxsql") ||
           ($type == "postgres") ||
           ($type == "mssql") ||

includes/base_net.inc.php

@@ -391 +391 @@
         $line = explode(" ", $response_l[$i]);
         for ($j=0; $j < sizeof($line); $j++ )
         {
-          if ( eregi("^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$", $line[$j]) )
+          if ( preg_match("/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,3})$/i", $line[$j]) )
           {
              if ( $email == "" )
                 $email = $line[$j];

includes/base_signature.inc.php

@@ -139 +139 @@
       {
          if ($tmp_ref_system_name == "snort")
          {
-           if (ereg("([0-9]+):([0-9]+)", $ref_tag, $backref))
+           if (preg_match("/([0-9]+):([0-9]+)/", $ref_tag, $backref))
            {
              if ($backref[1] == "1")
              {

includes/base_state_citems.inc.php

@@ -963 +963 @@
       for ( $i = 0; $i < $this->criteria_cnt; $i++ )
       {
         if ( (isset ($this->criteria[$i][3])) &&
-             (ereg("([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)", $this->criteria[$i][3])) )
+             (preg_match("/([0-9]*)\.([0-9]*)\.([0-9]*)\.([0-9]*)/", $this->criteria[$i][3])) )
         {
            $tmp_ip_str = $this->criteria[$i][7] = $this->criteria[$i][3];
            $this->criteria[$i][3] = strtok($tmp_ip_str, ".");

includes/base_state_common.inc.php

@@ -181 +181 @@
    if ( ($valid_data & VAR_SCORE) > 0 ) 
       $regex_mask = $regex_mask . "\-";
 
-   return ereg_replace("[^".$regex_mask."]", "", $item);
+   return preg_replace("/[^".$regex_mask."]/", "", $item);
 }
 
 /* ***********************************************************************

includes/base_state_criteria.inc.php

@@ -252 +252 @@
    if ( isset($_POST['current_view']) ) $query_string .= "&current_view=".$_POST['current_view'];
    if ( isset($_POST['submit']) ) $query_string .= "&submit=".$_POST['submit'];
 
-   $query_string = ereg_replace("back=1&", "", CleanVariable($query_string, VAR_PERIOD | VAR_DIGIT | VAR_PUNC | VAR_LETTER));
+   $query_string = preg_replace("/back=1&/", "", CleanVariable($query_string, VAR_PERIOD | VAR_DIGIT | VAR_PUNC | VAR_LETTER));
 
    ++$_SESSION['back_list_cnt'];
    $_SESSION['back_list'][$_SESSION['back_list_cnt']] =  

setup/setup2.php

@@ -68 +68 @@
    $arcdbpasswd = ImportHTTPVar("arcdbpasswd");
    $arcdbname = ImportHTTPVar("arcdbname", VAR_ALPHA | VAR_SCORE | VAR_USCORE);
 
+   // If they have mysqli, use it. Otherwise, fall back to the older "mysql" extension.
+   if ($dbtype == 'mysql') {
+       if (extension_loaded('mysqli')) {
+           $dbtype = 'mysqli';
+       } else {
+          $dbtype = 'mysql';
+       }
+   }
+
    $db = NewADOConnection($dbtype);
    $dbconnect = $db->Connect( ( ( $dbport == "") ? $dbhost : ($dbhost.":".$dbport) ),
                               $dbusername, $dbpasswd, $dbname);

setup/setup_db.inc.php

@@ -45 +45 @@
      }
 
      if ( !$tblBaseAG_present ) {
-        if ( $db->DB_type == "mysql" ) {
+        if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
            $sql = 'CREATE TABLE acid_ag ( ag_id               INT           UNSIGNED NOT NULL AUTO_INCREMENT,
                                           ag_name             VARCHAR(40),
                                           ag_desc             TEXT,
@@ -114 +114 @@
      }
 
      if ( !$tblBaseAGAlert_present ) {
-        if ( $db->DB_type == "mysql" ) {
+        if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
            $sql = 'CREATE TABLE acid_ag_alert( ag_id               INT           UNSIGNED NOT NULL,
                                                ag_sid              INT           UNSIGNED NOT NULL,
                                                ag_cid              INT           UNSIGNED NOT NULL,
@@ -151 +151 @@
      }
 
      if ( !$tblBaseIPCache_present ) {
-        if ( $db->DB_type == "mysql" ) {
+        if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
            $sql = 'CREATE TABLE acid_ip_cache( ipc_ip                  INT UNSIGNED NOT NULL,
                                                ipc_fqdn                VARCHAR(50),
                                                ipc_dns_timestamp       DATETIME,
@@ -193 +193 @@
      }
 
      if ( !$tblBaseEvent_present ) {
-           if ( $db->DB_type == "mysql" ) {  
+           if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
               if ( $db->baseGetDBversion() < 100 )
                  $sig_ddl = "signature      VARCHAR(255) NOT NULL,";
               else
@@ -319 +319 @@
       
      /* Added for base_roles and base_users -- Kevin */
      if ( !$tblBaseRoles_present ) {
-           if ( $db->DB_type == "mysql" ) {
+           if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
               $sql = 'CREATE TABLE base_roles ( role_id           int(11)         NOT NULL,
                                                 role_name         varchar(20)     NOT NULL,
                                                 role_desc         varchar(75)     NOT NULL,
@@ -385 +385 @@
      }
 
      if ( !$tblBaseUsers_present ) {
-           if ( $db->DB_type == "mysql" ) {
+           if ( $db->DB_type == "mysql" || $db->DB_type == "mysqli") {
               $sql = 'CREATE TABLE base_users ( usr_id            int(11)          NOT NULL,
                                                 usr_login         varchar(25)      NOT NULL,
                                                 usr_pwd           varchar(32)      NOT NULL,