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

Timestamp:

Apr 7, 2020, 10:15:48 PM (4 years ago)

Author:

chronos

Message:

• Modified: Improved code formatting.

File:

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

trunk/Modules/Export/Export.php

@@ -17 +17 @@
   {
     $this->TempDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
-    if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
+    if (!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
     $this->TempDirRelative = $this->System->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
     $this->SourceDir = dirname(__FILE__).'/../../'.$this->System->Config['Web']['SourceFolder'];
     $this->SourceDirRelative = $this->System->Config['Web']['SourceFolder'];
-    if(!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
+    if (!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
   }
 
@@ -29 +29 @@
     if ($Export['AllUsers']) {
       $DbResult2 = $this->System->Database->query('SELECT ID FROM `User` WHERE `ID` NOT IN(SELECT `User` FROM `ExportUser` WHERE `Export`='.$this->Id.')');
-      while($UserLine = $DbResult2->fetch_assoc())
+      while ($UserLine = $DbResult2->fetch_assoc())
       {
             $Condition = ' WHERE `Export`='.$this->Id.' AND `User`='.$UserLine['ID'];
             $DbResult = $this->System->Database->query('SELECT * FROM `ExportUser` '.$Condition); //,MAX(`Sequence`) as MaxSequence
-            if($DbResult->num_rows > 0)
+            if ($DbResult->num_rows > 0)
             {
             //  $this->System->Database->query('UPDATE `ExportUser` SET `Sequence`='.$Value.$Condition);
@@ -50 +50 @@
   {
     $DbResult = $this->Database->query('SELECT * FROM `Export` WHERE `Id`='.$this->Id);
-    if($DbResult->num_rows == 0) throw new Exception('Export '.$this->Id.' neexistuje');
+    if ($DbResult->num_rows == 0) throw new Exception('Export '.$this->Id.' neexistuje');
     $this->Export = $DbResult->fetch_assoc();
 
@@ -58 +58 @@
       'LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` '.
       'WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
-    while($UserLine = $DbResult->fetch_assoc())
+    while ($UserLine = $DbResult->fetch_assoc())
     {
       $this->UserNames .= ', '.$UserLine['Name'];
@@ -64 +64 @@
     $this->UserNames = substr($this->UserNames, 2);
 
-    if($this->Export['ClientVersion'] != '')
+    if ($this->Export['ClientVersion'] != '')
     {
       $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
@@ -82 +82 @@
 
     $DbResultItem = $this->System->Database->query('SELECT * FROM `ExportGroupItem` WHERE `Export`='.$this->Id);
-    while($GroupItem = $DbResultItem->fetch_assoc())
+    while ($GroupItem = $DbResultItem->fetch_assoc())
     {
       $GroupItems[$GroupItem['GroupItem']] = 1;
@@ -88 +88 @@
     // Build selected columns
     $Columns = '';
-    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+    foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
       if (!isset($GroupItems[$Column['Id']])) $Columns .= ' `T`.`'.$Column['Column'].'` AS `'.$Column['Column'].'`, ';
     }
@@ -104 +104 @@
     // Build columns for english texts
     $OriginalColumns = '';
-    foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
+    foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
       $OriginalColumns .= ' `T3`.`'.$Column['Column'].'` AS `En'.$Column['Column'].'`, ';
       if (isset($GroupItems[$Column['Id']]))
@@ -117 +117 @@
     '(`T3`.`VersionStart` = `T4`.`VersionStart`) AND (`T3`.`VersionEnd` = `T4`.`VersionEnd`)';
 
-    return($Query);
+    return $Query;
   }
 
@@ -129 +129 @@
     if (file_exists($file))
       $date = date('Y-m-d H:i',(filemtime($file)));
-    else return(true);
+    else return true;
   // echo $file;
 
@@ -135 +135 @@
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     $result = false;
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $Query = 'SELECT * FROM `'.$Group['TablePrefix'].'` AS `T`'.
@@ -149 +149 @@
         }
     }
-    return($result);
+    return $result;
   }
 
@@ -172 +172 @@
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $Buffer .= $Group['TablePrefix'].', ';
@@ -180 +180 @@
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    while($Group = $DbResult->fetch_assoc())
-    {
-      if($Group['MangosTable'] != '')
+    while ($Group = $DbResult->fetch_assoc())
+    {
+      if ($Group['MangosTable'] != '')
       {
         $Buffer .= "\n\n-- ".$Group['Name']."\n\n";
         $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-        if($DbResult2->num_rows > 0)
-        while($Line = $DbResult2->fetch_array())
+        if ($DbResult2->num_rows > 0)
+        while ($Line = $DbResult2->fetch_array())
         {
           $Values = '';
-          foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
-          if($GroupItem['Column'] != $Group['PrimaryKeyItem']) // Do not update primary key
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+          if ($GroupItem['Column'] != $Group['PrimaryKeyItem']) // Do not update primary key
           {
-            if($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
+            if ($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
             $Values .= ', `'.$GroupItem['MangosColumn'].'`="'.addslashes($Line[$GroupItem['Column']]).'"';
           }
@@ -200 +200 @@
           // Get multicolumn index
           $ColumnItems = explode(',', $Group['MangosTableIndex']);
-          if(count($ColumnItems) > 1)
+          if (count($ColumnItems) > 1)
           {
             $Where = 'CONCAT(';
-            foreach($ColumnItems as $ColumnItem)
+            foreach ($ColumnItems as $ColumnItem)
               $Where .= '`'.$ColumnItem.'`, "_", ';
             $Where = substr($Where, 0, -7).')';
@@ -216 +216 @@
       }
     }
-    if($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
-    return($Buffer);
+    if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
+    return $Buffer;
   }
 
@@ -243 +243 @@
       'aowow_skill' => 'skillID',
     );
-    foreach($AoWoWTables as $AoWoWTable => $IndexColum)
+    foreach ($AoWoWTables as $AoWoWTable => $IndexColum)
     {
       $Buffer .= '--'.$AoWoWTable.', ';
@@ -249 +249 @@
       $Query = 'SELECT `name`,`'.$IndexColum.'` FROM `'.$AoWoWTable.'`';
       $DbResult = $Database2->query($Query);
-      while($Line = $DbResult->fetch_assoc())
+      while ($Line = $DbResult->fetch_assoc())
       {
         $Ori_text = $Line['name'];
@@ -259 +259 @@
         $Tran = $DbResult2->fetch_assoc();
         //echo ($Line['name'].'='.$Tran['tran']);
-        if($Tran['Tran'] == '')
+        if ($Tran['Tran'] == '')
         {
           $DbResult2 = $Database2->query('SELECT `OptionText` AS `En`,
@@ -270 +270 @@
         }
 
-        if($Tran['Tran'] <> '')
+        if ($Tran['Tran'] <> '')
           $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['Tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
       }
@@ -276 +276 @@
     }
     */
-    if($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
-    return($Buffer);
+    if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
+    return $Buffer;
   }
 
@@ -299 +299 @@
           if (false === strpos($String2,$varible)) {
               //  echo $varible;
-            return(false);
+            return false;
           }
       }
     }
-    return (true);
+    return true;
   }
 
@@ -324 +324 @@
       'WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
     $Output = 'Počet generovaných skupin: '.$DbResult->num_rows."\n";
-    while($Group = $DbResult->fetch_assoc())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $this->AddProgress(2);
       $Output .= $Group['Name'].', ';
-      if(file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
+      if (file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'))
       {
         // Load string column index list
@@ -335 +335 @@
         $ColumnIndexes = array();
         $ColumnFormat = array();
-        while($DbRow = $DbResult2->fetch_assoc())
+        while ($DbRow = $DbResult2->fetch_assoc())
         {
           $ColumnFormat[$DbRow['ColumnIndex']] = FORMAT_STRING;
@@ -344 +344 @@
         $LookupTable = array();
         $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-        while($DbRow = $DbResult2->fetch_assoc()) {
+        while ($DbRow = $DbResult2->fetch_assoc()) {
           //Export only if translate have same varible %
           $CanExport = true;
-          foreach($TranslationTree[$Group['Id']]['Items'] as $Column)  {
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)  {
             $DbRow[$Column['Column']] = str_replace ( '$ ','$',$DbRow[$Column['Column']]);
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']])) {
@@ -369 +369 @@
 
         // Create new DBC file
-        if(!file_exists($this->TempDir.'dbc/')) mkdir ($this->TempDir.'dbc/', 0777, true);
+        if (!file_exists($this->TempDir.'dbc/')) mkdir ($this->TempDir.'dbc/', 0777, true);
         $NewDBCFile = new DBCFile();
         $NewDBCFile->CreateFile($this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
@@ -381 +381 @@
         $RowCount = $SourceDBCFile->GetRecordCount();
         $FieldCount = $SourceDBCFile->GetFieldCount();
-        for($Row = 0; $Row < $RowCount; $Row++)
+        for ($Row = 0; $Row < $RowCount; $Row++)
         {
           $Line = $SourceDBCFile->GetLine($Row);
@@ -388 +388 @@
           $PrimaryKeyItem = '';
           $ColumnItems = explode(',', $Group['DBCIndex']);
-          if(count($ColumnItems) > 1)
+          if (count($ColumnItems) > 1)
           {
-            foreach($ColumnItems as $ColumnItem)
+            foreach ($ColumnItems as $ColumnItem)
               $PrimaryKeyItem .= $Line[$ColumnItem].'_';
             $PrimaryKeyItem = substr($PrimaryKeyItem, 0, -1);
           } else $PrimaryKeyItem = $Line[$Group['DBCIndex']];
 
-          if(array_key_exists($PrimaryKeyItem, $LookupTable))
+          if (array_key_exists($PrimaryKeyItem, $LookupTable))
           {
             // Replace text columns
             $LookupTableItem = $LookupTable[$PrimaryKeyItem];
-            foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+            foreach ($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
             {
-              if(array_key_exists($GroupItem['Id'], $ColumnIndexes))
+              if (array_key_exists($GroupItem['Id'], $ColumnIndexes))
                 $Line[$ColumnIndexes[$GroupItem['Id']]] = $LookupTableItem[$GroupItem['Column']];
             }
@@ -409 +409 @@
           // Show completion progress
           $Progress = round($Row / $RowCount * 100);
-          if($Progress != $OldProgress)
+          if ($Progress != $OldProgress)
           {
             if (($Group['Id'] == 13) and ($Progress <> 100)) $this->AddProgress(0.01);
@@ -422 +422 @@
     }
     $Output .= 'Hotovo <br />';
-    return($Output);
+    return $Output;
   }
 
@@ -432 +432 @@
 
     $Output = '';
-    if(!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 0777, true);
+    if (!file_exists($this->TempDir.'lua/')) mkdir($this->TempDir.'lua/', 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())
+    while ($Group = $DbResult->fetch_assoc())
     {
       $this->AddProgress(1);
@@ -448 +448 @@
       $LookupTable = array();
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-      while($DbRow = $DbResult2->fetch_assoc()) {
+      while ($DbRow = $DbResult2->fetch_assoc()) {
           $CanExport = true;
-          foreach($TranslationTree[$Group['Id']]['Items'] as $Column)  {
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)  {
           //  if (strpos($DbRow[$Column['Column']],'\\'))
            //   $CanExport = false;
@@ -502 +502 @@
       }
 
-      while(!$File->EOF())
+      while (!$File->EOF())
       {
         $Line = $File->ReadLine();
-        if(strpos($Line, '=') !== false)
+        if (strpos($Line, '=') !== false)
         {
           $LineParts = explode('=', $Line, 2);
@@ -511 +511 @@
           $Line = trim($LineParts[1]);
 
-          if($Line[0] == '"')
+          if ($Line[0] == '"')
           {
             // Quoted string value
@@ -532 +532 @@
           $Value['Comment'] = addslashes(stripslashes(substr($Line, 3))); // Skip " --"
 
-          if(array_key_exists($Value['ShortCut'], $LookupTable))
+          if (array_key_exists($Value['ShortCut'], $LookupTable))
           {
             $DbRow = $LookupTable[$Value['ShortCut']];
@@ -548 +548 @@
           }
           $NewLine = $Value['ShortCut'].' = "'.$Value['Text'].'";';
-          //if($Value['Comment'] != '') $NewLine .= ' -- '.$Value['Comment'];
+          //if ($Value['Comment'] != '') $NewLine .= ' -- '.$Value['Comment'];
           $NewLine .= "\r\n";
           $File2->WriteLine($NewLine);
@@ -555 +555 @@
       $Output .= 'Hotovo <br/>';
     }
-    return($Output);
+    return $Output;
   }
 
@@ -656 +656 @@
     "    <author>".$this->System->User->Name."</author>\n".
     "    <contributors>\n";
-    foreach(explode(',', $this->UserNames) as $UserName)
+    foreach (explode(',', $this->UserNames) as $UserName)
       $Buffer .= "      <user>".$UserName."</user>\n";
     $Buffer .=
@@ -665 +665 @@
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
       'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
-    while($Group = $DbResult->fetch_assoc())
-    {
-      if($Group['MangosTable'] == '')
+    while ($Group = $DbResult->fetch_assoc())
+    {
+      if ($Group['MangosTable'] == '')
       {
         $Group['MangosTable'] = $Group['TablePrefix'];
@@ -674 +674 @@
       $Buffer .= '    <group id="'.$Group['Id'].'" name="'.$Group['TablePrefix'].'">'."\n";
       $DbResult2 = $this->Database->query($this->BuildQuery($Group));
-      while($Line = $DbResult2->fetch_assoc())
+      while ($Line = $DbResult2->fetch_assoc())
       {
         $Buffer .= '      <item id="'.$Line['Entry'].'" user="'.$Line['UserName'].'">'."\n";
         $Values = '';
-        foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
+        foreach ($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
         {
-          if($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
-          if($Line[$GroupItem['Column']] != '')
+          if ($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
+          if ($Line[$GroupItem['Column']] != '')
           $Buffer .= '        <text index="'.$GroupItem['Id'].'" name="'.
             $GroupItem['Column'].'">'.addslashes($Line[$GroupItem['Column']]).'</text>'."\n";
@@ -689 +689 @@
       $Buffer .= "    </group>\n";
     }
-    if($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
+    if ($this->Export['WithDiacritic'] != 1) $Buffer = utf2ascii($Buffer);
     $Buffer .= "  </translation>\n".
   "</document>";
-    return($Buffer);
+    return $Buffer;
   }
 }
@@ -732 +732 @@
       '((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND '.
       '(`TimeFinish` IS NULL) OR (`Export` ='.$TaskId.') ORDER BY `TimeQueued`'); // `Export`='.$Export->Id
-    while($Task = $DbResult->fetch_assoc())
+    while ($Task = $DbResult->fetch_assoc())
     {
       $Export = '<a href="'.$this->System->Link('/export/?Action=View&amp;ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';
@@ -744 +744 @@
       // Show estimated time to complete
       $PrefixMultiplier = new PrefixMultiplier();
-      if($Task['Progress'] > 0) {
+      if ($Task['Progress'] > 0) {
         $ElapsedTime = time() - MysqlDateTimeToTime($Task['TimeStart']);
         $Output .= T('Elapsed time').': <strong>'.$PrefixMultiplier->Add($ElapsedTime, '', 4, 'Time').'</strong> / ';
@@ -752 +752 @@
       $Output .= '</div>';
 
-      if($Task['Progress'] > 99)
+      if ($Task['Progress'] > 99)
         $Output .= '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
         'setTimeout("parent.location.href=\''.$this->System->Link('/export/?Action=View&Tab=7&ExportId='.$TaskId).'\'", 500)'.
         '</script>';
     }
-    return($Output);
+    return $Output;
   }
 }