Changeset 65 for trunk/Modules/Meet/Meet.php

Timestamp:

Apr 19, 2022, 10:25:41 PM (2 years ago)

Author:

chronos

Message:

• Added: Meet items import from La Tropcial school.
• Modified: Use explicit types for class fields.
• Modified: Use utf8mb4 encoding for database.
• Fixed: Spam items checking was inverted.

File:

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

trunk/Modules/Meet/Meet.php

@@ -13 +13 @@
 include_once(dirname(__FILE__).'/Import/Ella.php');
 include_once(dirname(__FILE__).'/Import/MgDance.php');
+include_once(dirname(__FILE__).'/Import/LaTropical.php');
 
 abstract class Gender
@@ -38 +39 @@
   $DateTime = str_replace('. ', '.', $DateTime);
   $Parts = explode(' ', $DateTime);
-  $DateParts = explode('.', $Parts[0]);
-  if (count($Parts) > 1) {
+  if (count($Parts) > 0) 
+  {
+    $DateParts = explode('.', $Parts[0]);
+  }
+  if (count($Parts) > 1) 
+  {
     $TimeParts = explode(':', $Parts[1]);
     if (count($TimeParts) == 1) $TimeParts[1] = '0';
@@ -260 +265 @@
   }
   return $Result;
+}
+
+function GetNameFromText(string $Text): string
+{
+  return '';
 }
 
@@ -334 +344 @@
 class MeetSources
 {
-  public $Database;
+  public Database $Database;
 
   function Parse(?int $Id = null): string
   {
     $Output = '';
-    $Where = '(Enabled=1)';
+    $Where = '1';
     if (($Id != null) and is_numeric($Id)) $Where .= ' AND (Id='.$Id.')';
     $DbResult = $this->Database->select('MeetSource', '*', $Where);
     while ($DbRow = $DbResult->fetch_assoc())
     {
-      $Method = $DbRow['Method'];
-      if ($Method == 'hes') $Source = new MeetSourceTanecniSkola();
-      else if ($Method == 'vavruska') $Source = new MeetSourceVavruska();
-      else if ($Method == 'salsadance') $Source = new MeetSourceSalsaDance();
-      else if ($Method == 'astra') $Source = new MeetSourceAstraPraha();
-      else if ($Method == 'seznamka') $Source = new MeetSourceSeznamka();
-      else if ($Method == 'amblar') $Source = new MeetSourceAmblar();
-      else if ($Method == 'majkluvsvet') $Source = new MeetSourceMajkluvSvet();
-      else if ($Method == 'csts') $Source = new MeetSourceCsts();
-      else if ($Method == 'facebook') $Source = new MeetSourceFacebook();
-      else if ($Method == 'eso') $Source = new MeetSourceEso();
-      else if ($Method == 'ella') $Source = new MeetSourceElla();
-      else if ($Method == 'mgdance') $Source = new MeetSourceMgDance();
-      else {
-        $Output .= 'Unsupported parse method: '.$Method.'<br/>';
-        continue;
-      }
-      $Source->Database = $this->Database;
-      $Source->Id = $DbRow['Id'];
-      $Source->URL = $DbRow['URL'];
-      $Source->Method = $Method;
-      $Source->Name = $DbRow['Name'];
-      $this->Items[] = $Source;
-      $Output .= $Source->DoImport();
+      if ($DbRow['Enabled'] == 1)
+      {
+        $Method = $DbRow['Method'];
+        if ($Method == 'hes') $Source = new MeetSourceTanecniSkola();
+        else if ($Method == 'vavruska') $Source = new MeetSourceVavruska();
+        else if ($Method == 'salsadance') $Source = new MeetSourceSalsaDance();
+        else if ($Method == 'astra') $Source = new MeetSourceAstraPraha();
+        else if ($Method == 'seznamka') $Source = new MeetSourceSeznamka();
+        else if ($Method == 'amblar') $Source = new MeetSourceAmblar();
+        else if ($Method == 'majkluvsvet') $Source = new MeetSourceMajkluvSvet();
+        else if ($Method == 'csts') $Source = new MeetSourceCsts();
+        else if ($Method == 'facebook') $Source = new MeetSourceFacebook();
+        else if ($Method == 'eso') $Source = new MeetSourceEso();
+        else if ($Method == 'ella') $Source = new MeetSourceElla();
+        else if ($Method == 'mgdance') $Source = new MeetSourceMgDance();
+        else if ($Method == 'latropical') $Source = new MeetSourceLaTropical();
+        else {
+          $Output .= 'Unsupported parse method: '.$Method.'<br/>';
+          continue;
+        }
+        $Source->Database = $this->Database;
+        $Source->Id = $DbRow['Id'];
+        $Source->URL = $DbRow['URL'];
+        $Source->Method = $Method;
+        $Source->Name = $DbRow['Name'];
+        $this->Items[] = $Source;
+        $Output .= $Source->DoImport();
+      } else $Output .= 'Parser '.$DbRow['Name'].' (#'.$DbRow['Id'].') disabled.<br/>'."\n";
     }
     return $Output;
@@ -375 +389 @@
 class MeetSource
 {
-  public $Name;
-  public $URL;
-  public $Method;
-  public $Id;
-  public $Database;
-  public $MeetItems;
-  public $AddCompareTime;
-  public $AddCompareRemoteId;
-  public $AddTimeInterval;
-  public $AddedCount;
+  public string $Name;
+  public string $URL;
+  public string $Method;
+  public string $Id;
+  public Database $Database;
+  public array $MeetItems;
+  public bool $AddCompareTime;
+  public bool $AddCompareRemoteId;
+  public int $AddTimeInterval;
+  public int $AddedCount;
 
   function __construct()
@@ -420 +434 @@
 class MeetItem
 {
-  var $Database;
-  var $Name = '';
-  var $Message = '';
-  var $Time = '';
-  var $Gender = Gender::Undefined;
-  var $Phone = '';
-  var $Email = '';
-  var $Age = '';
-  var $Height = '';
-  var $Source = 0;
-  var $Weight = '';
-  var $Location = '';
-  var $Image = '';
-  var $Link = '';
-  var $Title = '';
-  var $Level = '';
-  var $RemoteId = '';
+  public Database $Database;
+  public string $Name = '';
+  public string $Message = '';
+  public ?int $Time = 0;
+  public int $Gender = Gender::Undefined;
+  public string $Phone = '';
+  public string $Email = '';
+  public string $Age = '';
+  public string $Height = '';
+  public int $Source = 0;
+  public string $Weight = '';
+  public string $Location = '';
+  public string $Image = '';
+  public string $Link = '';
+  public string $Title = '';
+  public string $Level = '';
+  public string $RemoteId = '';
 
   function AddIfNotExist(int $TimeInterval = 0, bool $CompareTime = true, bool $CompareRemoteId = false): int
@@ -485 +499 @@
       if (strpos($this->Message, $Keyword) !== false)
       {
-        return false;
+        return true;
       }
     }
-    return true;
-  }
-}
+    return false;
+  }
+}