Changeset 664

Timestamp:

Dec 23, 2013, 10:52:03 PM (11 years ago)

Author:

maron

Message:

• Fixed: crash game by bad export of lua

Location:

trunk

Files:

• Modules/Export/Export.php (modified) (3 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Export/Export.php

@@ -232 +232 @@
           //Export only if translate have same varible %
     
-    if (strpos($String1,$StartChar)) {
-      while (strpos($String1,$StartChar)) {
-          $String1 = substr($String1,strpos($String1,$StartChar));
+    if (strpos($String1,$StartChar) !== false) {
+    
+      while ( strpos($String1,$StartChar) !== false) {
+          $pos = strpos($String1,$StartChar);
+          $String1 = substr($String1,$pos+1);
           $varible = $String1;
           if (strpos($varible,' ')) $varible = substr($varible,0,strpos($varible,' '));
@@ -241 +243 @@
           if (strpos($varible,'%')) $varible = substr($varible,0,strpos($varible,'%'));
           if (strpos($varible,chr(10))) $varible = substr($varible,0,strpos($varible,chr(10)));
+       //   echo $pos.'-'.$varible.'-'.$String1.'-' .$String2.'
+        //  ';
      
-          if (false == strpos($String2,$varible)) {
+          if (false === strpos($String2,$varible)) {
               //  echo $varible; 
             return(false);
@@ -382 +386 @@
           $CanExport = true;
           foreach($TranslationTree[$Group['Id']]['Items'] as $Column)  {
-            $DbRow[$Column['Column']] = str_replace ( '$ ','$',$DbRow[$Column['Column']]);
+          //  if (strpos($DbRow[$Column['Column']],'\\'))
+           //   $CanExport = false;
+        //    $DbRow[$Column['Column']] = str_replace ( '$ ','$',$DbRow[$Column['Column']]);
      //       echo $DbRow[$Column['Column']].'  -  '.$DbRow['En'.$Column['Column']].'
 //';
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']])) {
-              $CanExport = false;
-              $Output .= ', NE='.$DbRow['ID'];
+              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+              $CanExport = false;
             }  
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']])) {
-              $CanExport = false;
-              $Output .= ', NE='.$DbRow['ID'];
+              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+              $CanExport = false;
             }  
             if (!$this->HaveVarible($DbRow['En'.$Column['Column']],$DbRow[$Column['Column']],'%')) {
-              $CanExport = false;
-              $Output .=  ', NE='.$DbRow['ID'];
+              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+              $CanExport = false;
             }  
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'%')) {
-              $CanExport = false;
-              $Output .=  ', NE='.$DbRow['ID'];
+              if ($CanExport) $Output .= ', NE='.$DbRow['ID'];
+              $CanExport = false;
             }  
             if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'\\')) {
-              $CanExport = false;
-              $Output .=  ', NE='.$DbRow['ID'];
-            }  
-            if (!$this->HaveVarible($DbRow[$Column['Column']],$DbRow['En'.$Column['Column']],'\\')) {
-              $CanExport = false;
-              $Output .=  ', NE='.$DbRow['ID'];
+              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 ($CanExport)
             $LookupTable[$DbRow['ShortCut']] = $DbRow;

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update. 
 
-$Revision = 663; // Subversion revision
+$Revision = 664; // Subversion revision
 $DatabaseRevision = 646; // Database structure revision 
 $ReleaseTime = '2013-12-20';