Changeset 9 for branches

Timestamp:

May 9, 2008, 2:04:07 PM (16 years ago)

Author:

george

Message:

Přidáno: Import uživatelů a questů ze starého systému.
Přidáno: Zobrazení vícenásobných překladů.

Location:

branches/2

Files:

• frontend.php (modified) (6 diffs)
• mangos_import.php (modified) (2 diffs)
• translation.php (modified) (2 diffs)
• user.php (modified) (5 diffs)

branches/2/frontend.php

@@ -46 +46 @@
   }
 
-  function ShowText($TranslationGroupId)
-  {
-    
-    $TextList = $this->System->Modules['Translation']->GetMultipleText($TranslationGroupId, $_GET['Index']);
-    if(count($TextList) == 0)
+  function ShowText($TranslationGroupId, $Edit)
+  {
+    if($Edit)
     {
       // Edit new text
@@ -60 +58 @@
       $Output .= '</table>';
     }
-    else if(count($TextList) == 1)
+    else 
     {
       // Show only one
@@ -69 +67 @@
       }
       $Output .= '</table>';
-    } else 
-    { 
+    }
+    return($Output);
+  }
+ 
+  function ShowMultipleText($TranslationGroupId)
+  {
+    $TextList = $this->System->Modules['Translation']->GetMultipleText($TranslationGroupId, $_GET['Index']);
+    $EnglishText = array_shift($TextList);
+    if(count($TextList) == 0) $Output = $this->ShowText($EnglishText['Id'], 1);
+    else if(count($TextList) == 1) $Output = $this->ShowText($EnglishText['Id'], 0);
+    else {
       // Show multiple possibilites
-      $Output = '<strong>Více překladů jednoho textu:</strong><table class="TranslationTable">'.
+      $Output = '<strong>Více překladů jednoho textu:</strong><table>'.
        '<tr><th>ID</th><th>Titulek</th></tr>';
       foreach($TextList as $Text)
       {
-        $Output .= '<tr><td>'.$Text['Index'].'</td><td><a href="?Action=ShowText&amp;GroupId='.$Text['Id'].'">'.$Text['Text'].'</a></td></tr>';
+        $Output .= '<tr><td>'.$Text['Index'].'</td><td><a href="?Action=ShowText&amp;GroupId='.$Text['Id'].'&amp;Edit=0">'.$Text['Text'].'</a></td></tr>';
       }
       $Output .= '</table>';
@@ -92 +99 @@
     {
       if(strlen($Translation['Text']) > 30) $Translation['Text'] = substr($Translation['Text'], 0, 30).'...';
-      $Output .= '<tr><td>'.$Translation['Index'].'</td><td><a href="?Action=ShowText&amp;GroupId='.$Translation['Id'].'&amp;Index='.$Translation['Index'].'">'.$Translation['Text'].'</a></td><td>'.($Translation['TextCount'] - 1).'</td></tr>';
+      $Output .= '<tr><td>'.$Translation['Index'].'</td><td><a href="?Action=ShowMultipleText&amp;GroupId='.$Translation['Group'].'&amp;Index='.$Translation['Index'].'">'.$Translation['Text'].'</a></td><td>'.($Translation['TextCount'] - 1).'</td></tr>';
     }
     $Output .= '</table>'.$this->System->PagesList('?Action=TextGroupList&amp;GroupId='.$GroupId.'&amp;Page=', $Page, $this->System->Modules['Translation']->GetTextGroupListCount($GroupId, 1, 1), $ItemPerPage);
@@ -205 +212 @@
         break;
       case 'ShowText':
-        $Output = $this->ShowText($_GET['GroupId']);
+        $Output = $this->ShowText($_GET['GroupId'], $_GET['Edit']);
+        break;
+      case 'ShowMultipleText':
+        $Output = $this->ShowMultipleText($_GET['GroupId']);
         break;
       case 'TextGroupList':
@@ -229 +239 @@
         break;
       case 'ImportOldSystem':
-        $Output = $this->System->Modules['MangosImport']->ImportOldMangos();
+        $Output = $this->System->Modules['MangosImport']->ImportOldSystem();
         break;
     } 

branches/2/mangos_import.php

@@ -6 +6 @@
   {
     $Output = '';
-    $this->Database->delete('Text', '`Text`.`TranslationGroup`=(SELECT `TextGroup`.`Id` FROM `TextGroup` WHERE `TextGroup`.`Language`=1)');
+    $this->Database->query('DELETE FROM `Text` JOIN `TextGroup` ON `TextGroup`.`Language`=1 AND `TextGroup`.`Id` = `Text`.`TranslationGroup`');
     echo($this->Database->error);
-    $this->Database->delete('TranslationGroup', '`Language`=1');
+    $this->Database->delete('TextGroup', '`Language`=1');
     echo($this->Database->error);
 
@@ -47 +47 @@
   function ImportOldSystem()
   {
+    $Output = '';
+
+    // Import users
+    $this->Database->query('TRUNCATE TABLE `User`');
+    $DbResult = $this->Database->query('SELECT * FROM `quests`.`user`');
+    while($User = $DbResult->fetch_array())
+    {
+      $Language = $User['Language'] + 1;
+      if($Language == 1) $Language = 2;
+      $Role = 2;
+      if($User['gm'] == 1) $Role = 3;
+      if($User['gm'] == 2) $Role = 4;
+      $this->Database->insert('User', array('Name' => $User['user'], 'Password' => $User['pass'], 'Email' => $User['Email'], 'TranslationLanguage' => $Language, 'LastLoginTime' => $User['LastLogin'], 'LastIpAddress' => $User['LastIP'], 'Role' => $Role, 'Id' => $User['ID']));
+    }
+    $this->Database->insert('User', array('Name' => 'Anonym', 'Password' => '', 'Email' => '', 'TranslationLanguage' => 1, 'LastLoginTime' => '', 'LastIpAddress' => '', 'Role' => 1));
+    $this->Database->insert('User', array('Name' => 'MaNGOS', 'Password' => '', 'Email' => '', 'TranslationLanguage' => 1, 'LastLoginTime' => '', 'LastIpAddress' => '', 'Role' => 1));
+    $this->Database->insert('User', array('Name' => 'WoWEmu', 'Password' => '', 'Email' => '', 'TranslationLanguage' => 1, 'LastLoginTime' => '', 'LastIpAddress' => '', 'Role' => 1));
+    $UnknownUserId = $this->Database->insert_id;
+    $Output .= 'Uživatelé převedeni<br>';
+
+    // Import texts
+    $this->Database->query('CREATE TABLE Transition (OldIndex INT, NewIndex INT, INDEX OldIndex ) ENGINE=MEMORY');
+    //$this->Database->query('TRUNCATE TABLE `User`');
+    $DbResult = $this->Database->query('SELECT * FROM `quests`.`quests`');
+    while($Quest = $DbResult->fetch_array())
+    {
+      if($Quest['Language'] > 0)
+      {
+        if($Quest['User'] == 0) $Quest['User'] = $UnknownUserId;
+        if($Quest['Take'] > 0)
+        {
+          $DbResult2 = $this->Database->select('Transition', 'NewIndex', 'OldIndex='.$Quest['Take']);
+          $DbRow2 = $DbResult2->fetch_array();
+          $Take = $DbRow2['NewIndex'];
+        } else $Take = 0;
+
+        $this->Database->insert('TextGroup', array('Index' => $Quest['entry'], 'Group' => 1, 'Time' => 'NOW()', 'Language' => $Quest['Language'] + 1, 'OldSystem' => 1, 'Complete' => $Quest['complete'], 'OriginalText' => $Take));
+        //echo($this->Database->LastQuery);
+        $TextGroupId = $this->Database->insert_id;
+        $this->Database->insert('Transition', array('OldIndex' => $Quest['ID'], 'NewIndex' => $TextGroupId));
+        if($Quest['Title'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 1, 'Text' => $Quest['Title']));
+        if($Quest['Details'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 2, 'Text' => $Quest['Details']));
+        if($Quest['Objectives'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 3, 'Text' => $Quest['Objectives']));
+        if($Quest['OfferRewardText'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 4, 'Text' => $Quest['OfferRewardText']));
+        if($Quest['RequestItemsText'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 5, 'Text' => $Quest['RequestItemsText']));
+        if($Quest['EndText'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 6, 'Text' => $Quest['EndText']));
+        if($Quest['ObjectiveText1'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 7, 'Text' => $Quest['ObjectiveText1']));
+        if($Quest['ObjectiveText2'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 8, 'Text' => $Quest['ObjectiveText2']));
+        if($Quest['ObjectiveText3'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 9, 'Text' => $Quest['ObjectiveText3']));
+        if($Quest['ObjectiveText4'] != '') $this->Database->insert('Text', array('TranslationGroup' => $TextGroupId, 'GroupItem' => 10, 'Text' => $Quest['ObjectiveText4']));
+      }
+    }
+    $this->Database->query('DROP TABLE Transition');
+    $Output .= 'Questy převedeny<br>';
+    return($Output);
   }
 }

branches/2/translation.php

@@ -44 +44 @@
   {
     $Result = array();
-    $DbResult = $this->Database->query('SELECT `TextGroup`.*, (SELECT `Text` FROM `Text` WHERE `Text`.`TranslationGroup` = `TextGroup`.`Id` LIMIT 1) as `Text`, (SELECT COUNT(`TextGroup2`.`User`) FROM `TextGroup` AS `TextGroup2` WHERE `TextGroup2`.`Id` = `TextGroup`.`Id`) as `TextCount` FROM `TextGroup` WHERE `TextGroup`.`Group`='.$GroupId.' AND `TextGroup`.`User`='.$UserId.' AND `TextGroup`.`Language`='.$Language.' LIMIT '.($Page * $ItemPerPage).','.$ItemPerPage);
+    $DbResult = $this->Database->query('SELECT `TextGroup`.*, (SELECT `Text` FROM `Text` WHERE `Text`.`TranslationGroup` = `TextGroup`.`Id` LIMIT 1) as `Text`, (SELECT COUNT(`TextGroup2`.`User`) FROM `TextGroup` AS `TextGroup2` WHERE `TextGroup2`.`Index` = `TextGroup`.`Index` AND `TextGroup2`.`Group` = `TextGroup`.`Group`) as `TextCount` FROM `TextGroup` WHERE `TextGroup`.`Group`='.$GroupId.' AND `TextGroup`.`User`='.$UserId.' AND `TextGroup`.`Language`='.$Language.' LIMIT '.($Page * $ItemPerPage).','.$ItemPerPage);
     //echo($this->Database->LastQuery);
     if($DbResult->num_rows > 0)
@@ -66 +66 @@
   {
     $Result = array();
-    $DbResult = $this->Database->query('SELECT `TextGroup`.*, (SELECT `Text` FROM `Text` WHERE `Text`.`TranslationGroup` = `TextGroup`.`Id` LIMIT 1) as `Text` FROM `TextGroup` WHERE `TextGroup`.`Group`='.$GroupId.' AND `TextGroup`.`Index` = '.$Index.' AND `TextGroup`.`Language` != 1');
+    $DbResult = $this->Database->query('SELECT `TextGroup`.*, (SELECT `Text` FROM `Text` WHERE `Text`.`TranslationGroup` = `TextGroup`.`Id` LIMIT 1) as `Text` FROM `TextGroup` WHERE `TextGroup`.`Group`='.$GroupId.' AND `TextGroup`.`Index` = '.$Index.'');
     //echo($this->Database->LastQuery);
     if($DbResult->num_rows > 0)

branches/2/user.php

@@ -19 +19 @@
   var $User = array();
   var $DefaultRole = 2;
+  var $AnonymousUserId = 1;
   
   function Check()
@@ -30 +31 @@
       // Refresh time of last access
       $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('Time' => 'NOW()'));
-    } else $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => 1, 'Time' => 'NOW()', 'IpAddress' => (gethostbyaddr(GetRemoteAddress()).' '.GetRemoteAddress())));  
+    } else $this->Database->insert('UserOnline', array('SessionId' => $SID, 'User' => $AnonymousUserId, 'Time' => 'NOW()', 'IpAddress' => (gethostbyaddr(GetRemoteAddress()).' '.GetRemoteAddress())));  
 
     // Odeber neaktivní uživatele
@@ -38 +39 @@
     $Query = $this->Database->select('UserOnline', '*', 'SessionId="'.$SID.'"');
     $Row = $Query->fetch_array();
-    if($Row['User'] != 0) 
+    if($Row['User'] != $this->AnonymousUserId) 
     {
       $Query = $this->Database->select('User', '*', "Id=".$Row['User']."");
@@ -44 +45 @@
       $Result = USER_LOGGED;
     } else {
-      $Query = $this->Database->select('User', '*', "Id=1");
+      $Query = $this->Database->select('User', '*', "Id=".$this->AnonymousUserId);
       $this->User = $Query->fetch_array();
       $Result = USER_NOT_LOGGED;
@@ -97 +98 @@
   {
     $SID = session_id();
-    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => 1));
+    $this->Database->update('UserOnline', 'SessionId="'.$SID.'"', array('User' => $this->AnonymousUserId));
     return(USER_LOGGED_OUT);
   }