Changeset 376 for trunk/export

Timestamp:

Mar 11, 2010, 8:40:32 AM (15 years ago)

Author:

george

Message:

• Upraveno: Informace o přihlášeném uživateli nově pročištěny a sjednoceny do třídy User. SQL pro kontrolu a generovány hesel dostupné přímo přes metodu CryptPasswordSQL. Přístup k Id přihlášeného uživatele přes globální proměnnou $User a vlastnost Id ($User->Id). Podobně přístup k dalším vlastnostem uživatele.
• Opraveno: Některé chyby z předchozích předělávek.

Location:

trunk/export

Files:

• create_addon.php (modified) (1 diff)
• export.php (modified) (11 diffs)
• index.php (modified) (20 diffs)

trunk/export/create_addon.php

@@ -174 +174 @@
     $Group = $TranslationTree[14]; // client table
     $Column['Column'] = 'Text';
-    $Query = 'SELECT T2.'.$Column['Column'].' AS Translation, T3.'.$Column['Column'].' as Original, T3.ShortCut FROM (SELECT T1.entry, T1.'.$Column['Column'].' FROM (SELECT entry,'.$Column['Column'].' FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND VersionStart <= '.$this->ClientVersion['BuildNumber'].' AND VersionEnd >= '.$this->ClientVersion['BuildNumber'].' AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS T1 GROUP BY T1.entry) as T2 JOIN '.$Group['TablePrefix'].' AS T3 ON (T2.entry = T3.entry) AND (T3.Language = 0)';
+    $Query = 'SELECT `T2`.`'.$Column['Column'].'` AS `Translation`, `T3`.`'.$Column['Column'].'` AS `Original`, `T3`.`ShortCut` FROM (SELECT `T1`.`Entry`, `T1`.`'.$Column['Column'].'` FROM (SELECT `Entry`,`'.$Column['Column'].'` FROM '.$Group['TablePrefix'].' WHERE (`Complete` = 1) AND (`VersionStart` <= '.$this->ClientVersion['BuildNumber'].') AND (`VersionEnd` >= '.$this->ClientVersion['BuildNumber'].') AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.') AS `T1` GROUP BY `T1`.`Entry`) AS `T2` JOIN `'.$Group['TablePrefix'].'` AS `T3` ON (`T2`.`Entry` = `T3`.`Entry`) AND (`T3`.`Language` = 0)';
     $DbResult = $this->Database->query($Query);
     while($Line = $DbResult->fetch_array()) 

trunk/export/export.php

@@ -11 +11 @@
   var $SelectedUsers;
   var $UserNames;
-  var $User;
   var $ClientVersion;
   var $OrderByUserList;
@@ -38 +37 @@
     $this->UserNames = '';
     $DbResult = $this->Database->query('SELECT `ExportUser`.*, `User`.`Name`, `User`.`ID` FROM `ExportUser` LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
-    while($User = $DbResult->fetch_assoc())
-    {
-      $this->SelectedUsers .= ','.$User['ID'];
-      $this->UserNames .= ','.$User['Name'];
+    while($UserLine = $DbResult->fetch_assoc())
+    {
+      $this->SelectedUsers .= ','.$UserLine['ID'];
+      $this->UserNames .= ','.$UserLine['Name'];
     }
     $this->SelectedUsers = substr($this->SelectedUsers, 1);
@@ -56 +55 @@
     }
     
-    // Load logged user
-    if(isset($_SESSION) and ($_SESSION['UserID'] != ''))
-    {
-      $DbResult = $this->Database->query('SELECT `Name` FROM `User` WHERE `ID`='.$_SESSION['UserID']);
-      $this->User = $DbResult->fetch_assoc();
-    } else $this->User = array('User' => 'Neznámý');
-
-
     $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
     $this->ClientVersion = $DbResult->fetch_assoc();    
@@ -70 +61 @@
   function ExportToMangosSQL()
   {
-    global $TranslationTree, $LanguageList;
+    global $TranslationTree, $LanguageList, $User, $Config;
   
     $this->LoadFilters();
@@ -82 +73 @@
       "-- Znaková sada: ".$this->Config['Database']['Charset']." / ".$this->Config['Web']['Charset']."\n".
       "-- Diakritika: ".$this->AnoNe[$this->Export['WithDiacritic']]."\n".
-      "-- Vygeneroval uživatel: ".$this->User['Name']."\n".
+      "-- Vygeneroval uživatel: ".$User->Name."\n".
       "-- Vzato od uživatelů: ".$this->UserNames."\n".
       "-- Generované tabulky: ";
@@ -89 +80 @@
     while($Group = $DbResult->fetch_assoc())
     {
-       $Buffer .= $Group['MangosTable'].', ';
+      $Buffer .= $Group['TablePrefix'].', ';
     }
     $Buffer .= "\n\n";  
@@ -146 +137 @@
       {
         $Ori_text = $Line['name'];
-        $DbResult2 = $Database2->query('SELECT `text` AS en,
-        (SELECT `text` FROM `'.$Config['Database']['Database'].'`.`global_strings` AS `tabletran`
-         WHERE `tableen`.`entry` = `tabletran`.`entry` AND (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `tran`
-         FROM `'.$Config['Database']['Database'].'`.`global_strings` AS `tableen` WHERE
-          `text` = "'.addslashes($Ori_text).'" LIMIT 1');
+        $DbResult2 = $Database2->query('SELECT `Text` AS `En`,
+        (SELECT `Text` FROM `'.$Config['Database']['Database'].'`.`TextGlobalString` AS `TableTran`
+         WHERE `TableEn`.`Entry` = `TableTran`.`Entry` AND (`Complete` = 1) AND '.$this->WhereLang.' AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `Tran`
+         FROM `'.$Config['Database']['Database'].'`.`TextGlobalString` AS `TableEn` WHERE
+          `Text` = "'.addslashes($Ori_text).'" LIMIT 1');
         $Tran = $DbResult2->fetch_assoc();
         //echo ($Line['name'].'='.$Tran['tran']);
-        if($Tran['tran'] == '') 
+        if($Tran['Tran'] == '') 
         {
-          $DbResult2 = $Database2->query('SELECT `OptionText` AS `en`,
-          (SELECT `OptionText` FROM `'.$this->Config['Database']['Database'].'`.`npc_option` AS `tabletran`
-           WHERE `tableen`.`entry` = `tabletran`.`entry` AND (`Complete` = 1) AND '.$this->WhereLang.'
-            AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `tran`
-          FROM `'.$this->Config['Database']['Database'].'`.`npc_option` AS `tableen` WHERE
+          $DbResult2 = $Database2->query('SELECT `OptionText` AS `En`,
+          (SELECT `OptionText` FROM `'.$this->Config['Database']['Database'].'`.`TextNPCOption` AS `TableTran`
+           WHERE `TableEn`.`Entry` = `TableTran`.`Entry` AND (`Complete` = 1) AND '.$this->WhereLang.'
+            AND '.$this->WhereUsers.$this->OrderByUserList.' LIMIT 1) AS `Tran`
+          FROM `'.$this->Config['Database']['Database'].'`.`TextNPCOption` AS `TableEn` WHERE
             `OptionText` = "'.addslashes($Ori_text).'" LIMIT 1');
           $Tran = $DbResult2->fetch_assoc();
         }
         
-        if($Tran['tran'] <> '')
-          $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
+        if($Tran['Tran'] <> '')
+          $Buffer .= 'UPDATE `'.$AoWoWTable.'` SET `name` = "'.addslashes($Tran['Tran']).'" WHERE '.$IndexColum.' = '.$Line[$IndexColum].' ;'."\n";
       }
       $Buffer .= "\n\n";  
@@ -176 +167 @@
   function ExportToXML()
   {
-    global $TranslationTree, $LanguageList;
+    global $TranslationTree, $LanguageList, $User;
   
     $this->LoadFilters($this->Id);
@@ -186 +177 @@
     "    <time>".date('r')."</time>\n".
     "    <diacritics mode=".'"'.$this->Export['WithDiacritic'].'"'." />\n".
-    "    <author>".$this->User['Name']."</author>\n".
+    "    <author>".$User->Name."</author>\n".
     "    <contributors>\n";
     foreach(explode(',', $this->UserNames) as $UserName)
@@ -209 +200 @@
       while($Line = $DbResult2->fetch_assoc()) 
       {
-        $Buffer .= '      <item id="'.$Line['entry'].'" user="'.$Line['UserName'].'">'."\n";
+        $Buffer .= '      <item id="'.$Line['Entry'].'" user="'.$Line['UserName'].'">'."\n";
         $Values = '';
         foreach($TranslationTree[$Group['Id']]['Items'] as $GroupItem)
@@ -242 +233 @@
          $columns = '';
          foreach($TranslationTree[$Group['Id']]['Items'] as $Column) {
-           $columns .= ' T.'.$Column['Column'].' as text'.$i.',';
+           $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"';
+         $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`"';
       
        $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;

trunk/export/index.php

@@ -6 +6 @@
 function ExportList()
 {
-  global $Database;
+  global $Database, $User;
   
   echo('<a href="?Action=ViewList">Všechny</a>');
-  if(Licence(LICENCE_USER))
+  if($User->Licence(LICENCE_USER))
   {
     echo(' <a href="?Action=ViewList&amp;Filter=Others">Ostatních</a>');
@@ -18 +18 @@
   if(array_key_exists('Filter', $_GET))
   {
-    if($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$_SESSION['UserID'];
-    if($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$_SESSION['UserID'];
+    if($_GET['Filter'] == 'My') $Filter = ' WHERE `Export`.`User` = '.$User->Id;
+    if($_GET['Filter'] == 'Others') $Filter = ' WHERE `Export`.`User` != '.$User->Id;
   }
   
@@ -46 +46 @@
   {
     $Action = '<a href="?Action=View&amp;ExportId='.$Export['Id'].'">Zobrazit</a> <a href="?Action=View&amp;ExportId='.$Export['Id'].'&amp;Tab=6">Exportovat</a>';
-    if($Export['User'] == $_SESSION['UserID']) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
+    if($Export['User'] == $User->Id) $Action .= ' <a href="?Action=Delete&amp;ExportId='.$Export['Id'].'" onclick="return confirmAction(\'Opravdu smazat položku?\');">Smazat</a>';
     echo('<tr><td>'.HumanDate($Export['TimeCreate']).'</td><td>'.$Export['UserName'].'</td><td>'.$Export['Title'].'</td><td>'.$Export['UsedCount'].'</td><td>'.$Export['UserCount'].'</td><td>'.$Export['GroupCount'].'</td><td>'.$Action.'</td></tr>');
   }
@@ -52 +52 @@
   echo($PageList['Output']);
     
-  if(Licence(LICENCE_USER)) echo('<br/><div style="text-align: center;"><a href="?Action=Create">Vytvořit nový export</a></div>');
+  if($User->Licence(LICENCE_USER)) echo('<br/><div style="text-align: center;"><a href="?Action=Create">Vytvořit nový export</a></div>');
 }
 
 function ExportCreate()
 {
-  global $Database, $Config;
-  
-  if(Licence(LICENCE_USER))
+  global $Database, $Config, $User;
+  
+  if($User->Licence(LICENCE_USER))
   {   
-    $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM Export WHERE User='.$_SESSION['UserID']);
+    $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
     $DbRow = mysql_fetch_row($DbResult);
     if($DbRow[0] < $Config['MaxExportPerUser'])
@@ -77 +77 @@
 function ExportCreateFinish()
 {
-  global $Database, $Config;
-  
-  if(Licence(LICENCE_USER))
+  global $Database, $Config, $User;
+  
+  if($User->Licence(LICENCE_USER))
   {   
     if(array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
     {
-      $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Export` WHERE `User`='.$_SESSION['UserID']);
+      $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `Export` WHERE `User`='.$User->Id);
       $DbRow = mysql_fetch_row($DbResult);
       if($DbRow[0] < $Config['MaxExportPerUser'])
       {
-        $Database->SQLCommand('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$_SESSION['UserID'].', NOW(), 1, "'.$_POST['Description'].'")');
+        $Database->SQLCommand('INSERT INTO `Export` (`Title`, `User`, `TimeCreate`, `WithDiacritic`, `Description`) VALUES ("'.$_POST['Title'].'", '.$User->Id.', NOW(), 1, "'.$_POST['Description'].'")');
         $ExportId = mysql_insert_id();
         echo('Nový export vytvořen.<br/>Přímý odkaz na tento export: <a href="?Action=View&amp;ExportId='.$ExportId.'">zde</a><br/><br/>');
@@ -100 +100 @@
 function ExportDelete()
 {
-  global $Database;
-  
-  if(Licence(LICENCE_USER))
+  global $Database, $User;
+  
+  if($User->Licence(LICENCE_USER))
   {   
     if(array_key_exists('ExportId', $_GET))
     {
-      $DbResult = $Database->SQLCommand('SELECT * FROM Export WHERE Id='.$_GET['ExportId'].' AND User='.$_SESSION['UserID']);
+      $DbResult = $Database->SQLCommand('SELECT * FROM `Export` WHERE `Id`='.$_GET['ExportId'].' AND `User`='.$User->Id);
       if(mysql_num_rows($DbResult) > 0)
       {
-        $Database->SQLCommand('DELETE FROM Export WHERE Id='.$_GET['ExportId']);
+        $Database->SQLCommand('DELETE FROM `Export` WHERE `Id`='.$_GET['ExportId']);
         DeleteDirectory('../tmp/Export/'.$_GET['ExportId'].'/');
         echo('Export smazán.<br/><br/>');
@@ -122 +122 @@
 function ExportViewTranslators()
 {
-  global $Database, $TranslationTree, $Config;
+  global $Database, $TranslationTree, $Config, $User;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
@@ -131 +131 @@
     {    
       $Export = mysql_fetch_assoc($DbRows);
-      if(Licence(LICENCE_USER) and ($_SESSION['UserID'] == $Export['User'])) $Editable = true; 
+      if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
         else $Editable = false;
         
@@ -204 +204 @@
   $Database->SQLCommand('SET @I = 0');
   $DbResult = $Database->SQLCommand($Query);
-  while($User = mysql_fetch_assoc($DbResult))
-  {
-    $Checked = $User['Sequence'] != '';
-    $Selection = CheckBox('sel'.$User['ID'], $Checked, '', 'CheckBox', !$Editable);
-    $Sequence = '<input type="text" name="seq'.$User['ID'].'" style="text-align: center; width: 40px;" value="'.$User['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
+  while($UserLine = mysql_fetch_assoc($DbResult))
+  {
+    $Checked = $UserLine['Sequence'] != '';
+    $Selection = CheckBox('sel'.$UserLine['ID'], $Checked, '', 'CheckBox', !$Editable);
+    $Sequence = '<input type="text" name="seq'.$UserLine['ID'].'" style="text-align: center; width: 40px;" value="'.$UserLine['Sequence2'].'"'.$DisabledInput[$Editable].'/>';
     echo('<tr>
-    <td><a href="'.$Config['Web']['BaseURL'].'/TranslationList.php?user='.$User['ID'].'&amp;action=userall" title="Zobrazit všechny jeho přeložené texty">'.$User['Name'].'</a></td>
-    <td>'.$User['TranslatedCount'].'</td>
-      <td><img src="'.$Config['Web']['TempFolder'].'/user/'.$User['Name'].'/level.png" alt="Úroveň uživatele" /></td>
+    <td><a href="'.$Config['Web']['BaseURL'].'/TranslationList.php?user='.$UserLine['ID'].'&amp;action=userall" title="Zobrazit všechny jeho přeložené texty">'.$UserLine['Name'].'</a></td>
+    <td>'.$UserLine['TranslatedCount'].'</td>
+      <td><img src="'.$Config['Web']['TempFolder'].'/user/'.$UserLine['Name'].'/level.png" alt="Úroveň uživatele" /></td>
     <td>'.$Selection.'</td><td>'.$Sequence.'</td></tr>');
   }
@@ -224 +224 @@
 function ExportViewGeneral()
 {
-  global $Database;
+  global $Database, $User;
   
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
@@ -235 +235 @@
     {    
       $Export = mysql_fetch_assoc($DbRows);
-      if(Licence(LICENCE_USER) and ($_SESSION['UserID'] == $Export['User'])) $Editable = true; 
+      if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
         else $Editable = false;
       if($Editable and array_key_exists('Title', $_POST) and array_key_exists('Description', $_POST))
@@ -264 +264 @@
 function ExportViewLanguages()
 {
-  global $Database, $TranslationTree, $Config;
+  global $Database, $TranslationTree, $Config, $User;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
@@ -273 +273 @@
     {    
       $Export = mysql_fetch_assoc($DbRows);
-      if(Licence(LICENCE_USER) and ($_SESSION['UserID'] == $Export['User'])) $Editable = true; 
+      if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
         else $Editable = false;
         
@@ -357 +357 @@
 function ExportViewGroups()
 {
-  global $Database, $TranslationTree, $Config;
+  global $Database, $TranslationTree, $Config, $User;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
@@ -366 +366 @@
     {    
       $Export = mysql_fetch_assoc($DbRows);
-      if(Licence(LICENCE_USER) and ($_SESSION['UserID'] == $Export['User'])) $Editable = true; 
+      if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
         else $Editable = false;
         
@@ -446 +446 @@
 function ExportViewOutputFormat()
 {
-  global $Database;
+  global $Database, $User;
   
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
@@ -455 +455 @@
     {    
       $Export = mysql_fetch_assoc($DbRows);
-      if(Licence(LICENCE_USER) and ($_SESSION['UserID'] == $Export['User'])) $Editable = true; 
+      if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
         else $Editable = false;
   
@@ -485 +485 @@
 function ExportViewVersion()
 {
-  global $Database, $Config;
+  global $Database, $Config, $User;
 
   $DisabledInput = array(false => ' disabled="disabled"', true => '');
@@ -494 +494 @@
     {    
       $Export = mysql_fetch_assoc($DbRows);
-      if(Licence(LICENCE_USER) and ($_SESSION['UserID'] == $Export['User'])) $Editable = true; 
+      if($User->Licence(LICENCE_USER) and ($User->Id == $Export['User'])) $Editable = true; 
         else $Editable = false;
         
@@ -572 +572 @@
   $Export = mysql_fetch_assoc($DbResult);
   $DbResult = $Database->SQLCommand('SELECT * FROM `User` WHERE `ID`='.$Export['User']);
-  $User = mysql_fetch_assoc($DbResult);
-  echo('Export <strong><a href="?Action=View&amp;Tab=6&amp;ExportId='.$Export['Id'].'">'.$_GET['ExportId'].'</a></strong> překladatele <strong>'.$User['Name'].'</strong> s označením <strong>'.$Export['Title'].'</strong>');
+  $UserLine = mysql_fetch_assoc($DbResult);
+  echo('Export <strong><a href="?Action=View&amp;Tab=6&amp;ExportId='.$Export['Id'].'">'.$_GET['ExportId'].'</a></strong> překladatele <strong>'.$UserLine['Name'].'</strong> s označením <strong>'.$Export['Title'].'</strong>');
   ShowTabs(array('Obecné', 'Překladatelé', 'Překlady', 'Jazyky', 'Formát', 'Verze', 'Výstup'));
   echo('<div id="content">');