Changeset 380 for trunk

Timestamp:

Mar 11, 2010, 7:21:43 PM (15 years ago)

Author:

george

Message:

• Opraveno: Správně vylomítkování podřetězce SQL dotazu při volání exportu.

Location:

trunk

Files:

• export/DBCExport (modified) ( previous)
• export/export.php (modified) (3 diffs)
• includes/global_function.php (modified) (1 diff)
• save.php (modified) (1 diff)

trunk/export/export.php

@@ -25 +25 @@
     if($DbResult->num_rows == 0) die('Export '.$this->Id.' neexistuje');
     $this->Export = $DbResult->fetch_assoc();
-
+    
     // Filter selected languages
     $this->WhereLang = '';
     $DbResult = $this->Database->query('SELECT * FROM `ExportLanguage` WHERE `Export`='.$this->Id.' ORDER BY `Sequence`');
+    echo($this->Database->error);
     while($Language = $DbResult->fetch_assoc())
-      $this->WhereLang .= ' OR (Language = '.$Language['Language'].')'; 
+      $this->WhereLang .= ' OR (`Language` = '.$Language['Language'].')'; 
     if($this->WhereLang == '') $this->WhereLang = 1; 
       else $this->WhereLang = '('.substr($this->WhereLang, 4).')';
@@ -52 +53 @@
     } else
     {
-      $this->WhereUsers = '(User IN ('.$this->SelectedUsers.'))';
-      $this->OrderByUserList = ' ORDER BY FIELD(User, '.$this->SelectedUsers.')';
+      $this->WhereUsers = '(`User` IN ('.$this->SelectedUsers.'))';
+      $this->OrderByUserList = ' ORDER BY FIELD(`User`, '.$this->SelectedUsers.')';
     }
     
@@ -221 +222 @@
   function ExportToDBC()
   {
-    global $TranslationTree, $LanguageList,$Config;
+    global $TranslationTree, $LanguageList, $Config;
   
     $this->LoadFilters();
 
     $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
-    while($Group = $DbResult->fetch_assoc())
-    {
-      echo($Group['Name'].'... ');
-        if(file_exists('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc')) {
-                  
-         $i = 1;
-         $columns = '';
-         foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
-           $columns .= ' `T`.`'.$Column['Column'].'` AS `Text`'.$i.',';
-           $i = $i+1;
-         }
-         
-         $querty = '"SELECT '.$columns.' `T`.`Entry` AS `Entry` FROM (SELECT * FROM '.$Group['TablePrefix'].' WHERE (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')) AS `T` GROUP BY `T`.`Entry`"';
+    echo('Počet generovaných skupin: '.$DbResult->num_rows.'<br/>'."\n");
+    while($Group = $DbResult->fetch_assoc())
+    {
+      echo($Group['Name'].', ');
+      if(file_exists('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc')) 
+      {
+        $i = 1;
+        $columns = '';
+        foreach($TranslationTree[$Group['Id']]['Items'] as $Column) 
+        {
+          $columns .= ' `T`.`'.$Column['Column'].'` AS `Text'.$i.'`,';
+          $i = $i + 1;
+        }
+        $Query = 'SELECT '.$columns.' `T`.`Entry` AS `Entry` FROM (SELECT * FROM `'.$Group['TablePrefix'].'` WHERE (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.' AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].')) AS `T` GROUP BY `T`.`Entry`';
+        $Query = str_replace('`', '\`', $Query);
+        $Query = '"'.str_replace(' ', '\ ', $Query).'"';
       
-       $params = '-u '.$Config['Database']['User'].' -p '.$Config['Database']['Password'].' -f ../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc -n '.$this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc -c '.GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']).' -q '.$querty;
+        $params = '-u '.$Config['Database']['User'].' -p '.$Config['Database']['Password'].' -f ../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc -n '.$this->TempDir.'dbc/'.$Group['DBCFileName'].'.dbc -c '.GetDBCColumns($this->ClientVersion['Version'], $Group['DBCFileName']).' -q '.$Query;
       
-     //  echo('./DBCExport '.$params);
+        //echo('./DBCExport '.$params);       
+        exec('./DBCExport '.$params);
        
-       exec('./DBCExport '.$params);
-       
-      echo('Hotovo <br />
-');
       } else echo('Zdrojový soubor '.'../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n");
     }
+    echo('Hotovo <br />');
   }
 

trunk/includes/global_function.php

@@ -138 +138 @@
   }
   return(array(
-    'SQL' => ' ORDER BY '.$_SESSION['OrderCol'].' '.$OrderDirSQL[$_SESSION['OrderDir']],
+    'SQL' => ' ORDER BY `'.$_SESSION['OrderCol'].'` '.$OrderDirSQL[$_SESSION['OrderDir']],
     'Output' => '<tr>'.$Result.'</tr>',
     'Column' => $_SESSION['OrderCol'],

trunk/save.php

@@ -16 +16 @@
   $Language = $_POST['Language'] * 1;
   if(array_key_exists('End', $_POST)) $Complete = 1;
-    else $complete = 0;
+    else $Complete = 0;
              
   $DbResult = $Database->SQLCommand('SELECT * FROM `'.$Table.'` WHERE (`Language` = 0) AND (`Entry` = '.$Entry.')');