Changeset 363 for trunk

Timestamp:

Mar 8, 2010, 1:54:55 PM (15 years ago)

Author:

george

Message:

• Opraveno: Import export lua souborů. Při importu převádět lomítkovou notaci do databáze na funkční znaky \n => odřádkování, \" => uvozovky. V databázi musí být uloženo správně bez lomítek.

Location:

trunk

Files:

• export/export.php (modified) (3 diffs)
• import/import_lua.php (modified) (4 diffs)
• sql/updates/363.sql (added)

trunk/export/export.php

@@ -297 +297 @@
           $Value['ShortCut'] = trim($LineParts2[0]);
           $Value['Text'] = substr(trim($LineParts2[1]), 1, -1);
-          $Value['Comment'] = addslashes(substr(trim($LineParts[1]), 3));
-
-          $Query = 'SELECT * FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (ShortCut="'.$Value['ShortCut'].'") AND (VersionStart <= '.$this->ClientVersion['BuildNumber'].') AND (VersionEnd >= '.$this->ClientVersion['BuildNumber'].')'.$this->OrderByUserList.') AS T GROUP BY T.entry';
+          $Value['Comment'] = substr(trim($LineParts[1]), 3);
+
+          $Query = 'SELECT * FROM (SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (`ShortCut`="'.$Value['ShortCut'].'") AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')'.$this->OrderByUserList.') AS `T` GROUP BY `T`.`entry`';
           //echo($Query);
           $DbResult2 = $this->Database->query($Query);
@@ -305 +305 @@
           {
             $DbRow = $DbResult2->fetch_assoc();
-            $Value['Text'] = $DbRow['Text'];
-            $Value['Comment'] = $DbRow['Comment'];
+            $Value['Text'] = addslashes($DbRow['Text']);
+            $Value['Comment'] = addslashes($DbRow['Comment']);
             //echo('.');
           }
@@ -315 +315 @@
         } else $File2->WriteLine($Line."\n");
       }
-      echo('Hotovo <br />');
+      echo('Hotovo <br/>');
     }
   }

trunk/import/import_lua.php

@@ -4 +4 @@
 {
   global $Database, $TranslationTree, $PatchVersion, $Config;
+  
   $BuildNumber = GetBuildNumber($import_version);
   
@@ -24 +25 @@
           $LineParts2 = explode('=', $LineParts[0]);
           $Value['ShortCut'] = trim($LineParts2[0]);
-          $Value['Text'] = substr(trim($LineParts2[1]), 1, -1);
-          $Value['Comment'] = addslashes(substr(trim($LineParts[1]), 3));
+          $Value['Text'] = addslashes(stripslashes(substr(trim($LineParts2[1]), 1, -1)));
+          $Value['Comment'] = addslashes(stripslashes(substr(trim($LineParts[1]), 3)));
 
           $Columns = '';
           foreach($Group['Items'] as $GroupItem)
           {
-            $Columns .= ', '.$GroupItem['Column'].' ';
+            $Columns .= ', `'.$GroupItem['Column'].'` ';
           }
           $Columns = substr($Columns, 1);
 
-          $DbResult2 = $Database->SQLCommand('SELECT VersionEnd, ID, entry, '.$Columns.' FROM '.$Group['TablePrefix'].' WHERE ShortCut="'.$Value['ShortCut'].'" AND (Language=0) ORDER BY VersionStart DESC LIMIT 1');
+          $DbResult2 = $Database->SQLCommand('SELECT `VersionEnd`, `ID`, `entry`, '.$Columns.' FROM '.$Group['TablePrefix'].' WHERE `ShortCut`="'.$Value['ShortCut'].'" AND (`Language`=0) ORDER BY `VersionStart` DESC LIMIT 1');
           if(isset($DbResult2) and (mysql_num_rows($DbResult2) > 0))
           {
@@ -41 +42 @@
             if(HaveSameText($Group, $DbRow2, $Value)) 
             {
-        if ($DbRow2['VersionEnd'] <> $BuildNumber) {
-                $Database->SQLCommand('UPDATE `'.$Group['TablePrefix'].'` SET VersionEnd = "'.$BuildNumber.'" WHERE ID='.$DbRow2['ID']);
-          echo(', '); 
-        } else
-          echo('. '); 
+              if($DbRow2['VersionEnd'] <> $BuildNumber) 
+              {
+                $Database->SQLCommand('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = "'.$BuildNumber.'" WHERE `ID`='.$DbRow2['ID']);
+                echo(', '); 
+              } else
+              echo('. '); 
             } else 
             {       
-              $Columns = 'entry, language, VersionStart, VersionEnd';
+              $Columns = '`entry`, `language`, `VersionStart`, `VersionEnd`';
               $Values = $DbRow2['entry'].', 0, '.$BuildNumber.', '.$BuildNumber;
               foreach($Group['Items'] as $GroupItem) 
@@ -69 +71 @@
               $Entry += $DbRow[0];
             }           
-            $Columns = 'entry, language, VersionStart, VersionEnd';
+            $Columns = '`entry`, `language`, `VersionStart`, `VersionEnd`';
             $Values = $Entry.', 0, '.$BuildNumber.', '.$BuildNumber;
             foreach($Group['Items'] as $GroupItem)