Changeset 894 for trunk/Modules/Export/Export.php

Timestamp:

Mar 6, 2023, 12:16:38 PM (21 months ago)

Author:

chronos

Message:

• Fixed: Export error due to PHP 8.1 deprecated code.
• Modified: Code cleanup.

File:

• trunk/Modules/Export/Export.php (modified) (14 diffs)

trunk/Modules/Export/Export.php

@@ -9 +9 @@
   public int $Id;
   public array $AnoNe = array('Ne', 'Ano');
-  var $WhereLang;
-  var $WhereUsers;
-  var $SelectedUsers;
-  var $UserNames;
-  var $ClientVersion;
-  var $OrderByUserList;
+  public string $WhereLang;
+  public string $WhereUsers;
+  public string $UserNames;
+  public array $ClientVersion;
+  public string $OrderByUserList;
   public string $TempDir;
   public string $TempDirRelative;
@@ -23 +22 @@
   function Init()
   {
-    $this->TempDir = dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
+    $this->TempDir = NormalizePath(dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['TempFolder'].'Export/'.$this->Id.'/');
     if (!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
     $this->TempDirRelative = Core::Cast($this->System)->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
-    $this->SourceDir = dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['SourceFolder'];
+    $this->SourceDir = NormalizePath(dirname(__FILE__).'/../../'.Core::Cast($this->System)->Config['Web']['SourceFolder']);
     $this->SourceDirRelative = Core::Cast($this->System)->Config['Web']['SourceFolder'];
     if (!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
@@ -131 +130 @@
   }
 
-  function NeedGeneration()
+  function NeedGeneration(): bool
   {
     $this->LoadFilters();
-    $file = '';
-    if ($this->Export['OutputType'] == 10) $file = $this->TempDir.'Instalace_CzechWoW_'.$this->ClientVersion['Version'].'.exe';
-    if ($this->Export['OutputType'] == 9) $file = $this->TempDir.'CzWoW_DBC.zip';
-
-    if (file_exists($file))
-      $date = date('Y-m-d H:i',(filemtime($file)));
+    $FileName = '';
+    if ($this->Export['OutputType'] == 10) $FileName = $this->TempDir.'Instalace_CzechWoW_'.$this->ClientVersion['Version'].'.exe';
+    if ($this->Export['OutputType'] == 9) $FileName = $this->TempDir.'CzWoW_DBC.zip';
+
+    if (file_exists($FileName))
+    {
+      $Date = date('Y-m-d H:i',(filemtime($FileName)));
+    }
     else return true;
 
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    $result = false;
+    $Result = false;
     while ($Group = $DbResult->fetch_assoc())
     {
@@ -151 +152 @@
       ' JOIN `User` ON `User`.`ID`=`T`.`User`'.
       ' JOIN `ExportLanguage` ON (`ExportLanguage`.`Export`='.$this->Id.')'.
-      ' WHERE ( \''.$date.'\' < `T`.`ModifyTime`) AND (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.
+      ' WHERE ( \''.$Date.'\' < `T`.`ModifyTime`) AND (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.
       ' ';
 
@@ -157 +158 @@
       if ($DbResult2->num_rows > 0)
       {
-        $result = true;
-      }
-    }
-    return $result;
+        $Result = true;
+      }
+    }
+    return $Result;
   }
 
@@ -206 +207 @@
           {
             if ($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
-            $Values .= ', `'.$GroupItem['MangosColumn'].'`="'.addslashes($Line[$GroupItem['Column']]).'"';
+            $Text = $Line[$GroupItem['Column']];
+            if ($Text == null) $Text = '';
+            $Values .= ', `'.$GroupItem['MangosColumn'].'`="'.addslashes($Text).'"';
           }
           $Values = substr($Values, 2);
@@ -328 +331 @@
   }
 
-  function ExportToDBC()
+  function ExportToDBC(): string
   {
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
-
     $this->LoadFilters();
-
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` '.
@@ -342 +343 @@
       $this->AddProgress(2);
       $Output .= $Group['Name'].', ';
-      if (file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
+
+      $SourceDbcFileName = $this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc';
+      if (file_exists($SourceDbcFileName))
       {
         // Load string column index list
@@ -364 +367 @@
           foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)
           {
-            $DbRow[$Column['Column']] = str_replace ('$ ', '$', $DbRow[$Column['Column']]);
-            if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']]))
+            if ($DbRow[$Column['Column']] != null) 
+            { 
+              $DbRow[$Column['Column']] = str_replace('$ ', '$', $DbRow[$Column['Column']]);
+            }
+            $EnText = $DbRow['En'.$Column['Column']];
+            if ($EnText == null) $EnText = '';
+            $TargetText = $DbRow[$Column['Column']];
+            if ($TargetText == null) $TargetText = '';
+            if (!$this->HaveVariable($EnText, $TargetText))
             {
               $CanExport = false;
               $Output .= ', NE='.$DbRow['ID'];
             }
-            if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']]))
+            if (!$this->HaveVariable($TargetText, $EnText))
             {
               $CanExport = false;
@@ -383 +393 @@
         // Open original DBC file
         $SourceDBCFile = new DBCFile();
-        $SourceDBCFile->OpenFile($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
+        $SourceDBCFile->OpenFile($SourceDbcFileName, $ColumnFormat);
 
         // Create new DBC file
-        if (!file_exists($this->TempDir.'dbc/')) mkdir($this->TempDir.'dbc/', 0777, true);
+        $DbcDir = $this->TempDir.'dbc/';
+        if (!file_exists($DbcDir)) mkdir($DbcDir, 0777, true);
         $NewDBCFile = new DBCFile();
-        $NewDBCFile->CreateFile($this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
+        $NewDBCFile->CreateFile($DbcDir.$Group['DBCFileName'].'.dbc', $ColumnFormat);
         $NewDBCFile->SetRecordCount($SourceDBCFile->GetRecordCount());
         $NewDBCFile->SetFieldCount($SourceDBCFile->GetFieldCount());
@@ -436 +447 @@
         }
         $NewDBCFile->Commit();
-      } else $Output .= ShowMessage('Zdrojový soubor '.$this->SourceDirRelative.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n", MESSAGE_CRITICAL);
+      } else $Output .= ShowMessage('Zdrojový soubor '.$SourceDbcFileName.' nenalezen.'."\n", MESSAGE_CRITICAL);
     }
     $Output .= 'Hotovo <br />';
@@ -442 +453 @@
   }
 
-  function ExportToLua()
+  function ExportToLua(): string
   {
     $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
@@ -449 +460 @@
 
     $Output = '';
-    if (!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 0777, true);
+    $LuaDir = $this->TempDir.'lua/';
+    if (!file_exists($LuaDir)) mkdir($LuaDir, 0777, true);
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`LuaFileName` != ""');
     while ($Group = $DbResult->fetch_assoc())
     {
       $this->AddProgress(1);
-    //  $this->AddProgress();
       $Output .= $Group['Name'].'... ';
       $File = new FileStream();
-      if (!file_exists($this->SourceDir.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua'))
+      $SourceLuaFileName = $this->SourceDir.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua';
+      if (!file_exists($SourceLuaFileName)) 
+      {
         continue;
-      $File->OpenFile($this->SourceDir.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
+      }
+      $File->OpenFile($SourceLuaFileName);
       $File2 = new FileStream();
-      $File2->CreateFile($this->TempDir.'lua/'.$Group['LuaFileName'].'.lua');
+      $File2->CreateFile($LuaDir.$Group['LuaFileName'].'.lua');
 
       $LookupTable = array();
@@ -722 +736 @@
     if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
     $Buffer .= "  </translation>\n".
-  "</document>";
+      '</document>';
     return $Buffer;
   }