Changeset 882 for trunk

Timestamp:

Apr 8, 2020, 12:35:38 AM (5 years ago)

Author:

chronos

Message:

• Fixed: Error exporting Lua with empty variables in text.

Location:

trunk

Files:

• Application/Version.php (modified) (1 diff)
• Modules/Export/Export.php (modified) (5 diffs)

trunk/Application/Version.php

@@ -7 +7 @@
 
 $Version = '1.0';
-$Revision = 881; // Subversion revision
+$Revision = 882; // Subversion revision
 $DatabaseRevision = 873; // Database structure revision
-$ReleaseDate = strtotime('2020-04-07');
+$ReleaseDate = strtotime('2020-04-08');

trunk/Modules/Export/Export.php

@@ -283 +283 @@
   }
 
-  // Export only if translate have same varible %
-  function HaveVarible($String1, $String2, $StartChar = '$')
+  // Export only if translate have same variable %
+  function HaveVariable($String1, $String2, $StartChar = '$')
   {
     if (strpos($String1, $StartChar) !== false)
@@ -292 +292 @@
         $pos = strpos($String1, $StartChar);
         $String1 = substr($String1, $pos + 1);
-        $varible = $String1;
-        if (strpos($varible, ' ')) $varible = substr($varible, 0, strpos($varible, ' '));
-        if (strpos($varible, '.')) $varible = substr($varible, 0, strpos($varible, '.'));
-        if (strpos($varible, ',')) $varible = substr($varible, 0, strpos($varible, ','));
-        if (strpos($varible, '%')) $varible = substr($varible, 0, strpos($varible, '%'));
-        if (strpos($varible, chr(10))) $varible = substr($varible, 0, strpos($varible, chr(10)));
-
-        if (false === strpos($String2, $varible))
+        $Variable = $String1;
+        if (strpos($Variable, ' ')) $Variable = substr($Variable, 0, strpos($Variable, ' '));
+        if (strpos($Variable, '.')) $Variable = substr($Variable, 0, strpos($Variable, '.'));
+        if (strpos($Variable, ',')) $Variable = substr($Variable, 0, strpos($Variable, ','));
+        if (strpos($Variable, '%')) $Variable = substr($Variable, 0, strpos($Variable, '%'));
+        if (strpos($Variable, chr(10))) $Variable = substr($Variable, 0, strpos($Variable, chr(10)));
+
+        if (($Variable != '') and (strpos($String2, $Variable) === false))
         {
           return false;
@@ -348 +348 @@
         while ($DbRow = $DbResult2->fetch_assoc())
         {
-          //Export only if translate have same varible %
+          // Export only if translate have same variable %
           $CanExport = true;
           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']]))
+            $DbRow[$Column['Column']] = str_replace ('$ ', '$', $DbRow[$Column['Column']]);
+            if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']]))
             {
               $CanExport = false;
               $Output .= ', NE='.$DbRow['ID'];
             }
-            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']]))
+            if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']]))
             {
               $CanExport = false;
@@ -455 +455 @@
       while ($DbRow = $DbResult2->fetch_assoc())
       {
-          $CanExport = true;
-          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)
-          {
+        $CanExport = true;
+        foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)
+        {
           //  if (strpos($DbRow[$Column['Column']],'\\'))
            //   $CanExport = false;
@@ -463 +463 @@
          //   $DbRow[$Column['Column']] = $DbRow['En'.$Column['Column']];
 
-            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']]))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']]))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'%'))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'%'))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'\\'))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'\\'))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'|'))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'|'))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],chr(10)))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-            if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],chr(10)))
-            {
-              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
-              $CanExport = false;
-            }
-          }
+          if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']]))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']]))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']], '%'))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']], '%'))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']], '\\'))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']], '\\'))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']], '|'))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']], '|'))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow[$Column['Column']], $DbRow['En'.$Column['Column']], chr(10)))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+          if (!$this->HaveVariable($DbRow['En'.$Column['Column']], $DbRow[$Column['Column']], chr(10)))
+          {
+            if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+            $CanExport = false;
+          }
+        }
 
         if ($CanExport)