Fix: Parsing and compiling CSV with Firewall and BFP log.

CleanTalk · Jan 11, 2021 · 9854bbb · 9854bbb
1 parent d0cd23e
commit 9854bbb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/uniforce/lib/Cleantalk/USP/Uniforce/Firewall/BFP.php b/uniforce/lib/Cleantalk/USP/Uniforce/Firewall/BFP.php
@@ -203,7 +203,10 @@ public static function update_log( $fw_result ) {
 			isset($log[8]) ? intval( $log[8] ) + 1 : 1,
 		);
 
-		file_put_contents( $log_path, implode(',', $log), LOCK_EX );
+		$fd = fopen( $log_path, 'w' );
+		flock( $fd, LOCK_EX );
+		fputcsv( $fd, $log );
+		fclose( $fd );
 
 	}
 
@@ -228,8 +231,9 @@ public static function send_log( $ct_key ){
 				$data = array();
 
 				foreach( $log_files as $log_file ){
+
 					$log = file_get_contents( $log_dir_path . DS . $log_file );
-					$log = explode( ',', $log );
+					$log = str_getcsv( $log );
 
 					if( strval( $log[8] ) > 0 ){
 						for( $i = 0; strval( $log[8] ) > $i; $i ++ ){

diff --git a/uniforce/lib/Cleantalk/USP/Uniforce/Firewall/FW.php b/uniforce/lib/Cleantalk/USP/Uniforce/Firewall/FW.php
@@ -164,7 +164,7 @@ public static function send_log( $ct_key ){
 			foreach ( $log_files as $log_file ){
 
 				$log = file_get_contents( $log_dir_path . DS . $log_file );
-				$log = explode( ',', $log );
+				$log = str_getcsv( $log );
 
 				//Compile log
 				$to_data = array(

diff --git a/uniforce/lib/Cleantalk/USP/Uniforce/Firewall/FirewallModule.php b/uniforce/lib/Cleantalk/USP/Uniforce/Firewall/FirewallModule.php
@@ -73,7 +73,7 @@ public static function update_log( $fw_result ){
 		if( file_exists( $log_path ) ){
 
 			$log = file_get_contents($log_path);
-			$log = explode(',', $log);
+			$log = str_getcsv( $log );
 
 			$all_entries = isset($log[5]) ? $log[5] : 0;
 
@@ -107,7 +107,10 @@ public static function update_log( $fw_result ){
 
 		}
 
-		file_put_contents( $log_path, implode(',', $log), LOCK_EX );
+		$fd = fopen( $log_path, 'w' );
+		flock( $fd, LOCK_EX );
+		fputcsv( $fd, $log );
+		fclose( $fd );
 	}
 
 	/**