Changeset 59 for trunk

Timestamp:

Sep 16, 2020, 11:15:46 AM (4 years ago)

Author:

chronos

Message:

• Fixed: Possible empty email parsed from meet message.

File:

• trunk/Modules/Meet/Meet.php (modified) (3 diffs)

trunk/Modules/Meet/Meet.php

@@ -259 +259 @@
     $Pattern = '/[a-z0-9_\-\+\.]+@[a-z0-9\-]+\.([a-z]{2,4})(?:\.[a-z]{2})?/i';
     preg_match_all($Pattern, $Text, $Matches);
-    if (count($Matches) > 0)
+    if ((count($Matches) > 0) and ($Matches[0][0] != ''))
+    {
       $Result = $Matches[0][0];
+    }
   }
   return $Result;
@@ -443 +445 @@
         else $Weight = $this->Weight;
       $this->Database->insert('MeetItem', array(
+        'Source' => $this->Source,
+        'Link' => $this->Link,
+        'Email' => $this->Email,
         'Message' => $this->Message,
         'Time' => TimeToMysqlDateTime($this->Time),
         'Gender' => $this->Gender,
         'Age' => $Age,
-        'Email' => $this->Email,
         'Phone' => $this->Phone,
         'Name' => $this->Name,
@@ -453 +457 @@
         'Weight' => $Weight,
         'Location' => $this->Location,
-        'Source' => $this->Source,
-        'Link' => $this->Link,
         'RemoteId' => $this->RemoteId,
         'TimeImport' => 'NOW()',