Changeset 884 for trunk/Modules/Admin

Timestamp:

Apr 8, 2020, 7:27:09 PM (5 years ago)

Author:

chronos

Message:

• Fixed: Error during user registration.
• Fixed: Error on user enter to new team.

File:

• trunk/Modules/Admin/Admin.php (modified) (9 diffs)

trunk/Modules/Admin/Admin.php

@@ -127 +127 @@
       //  '(Select `ID` FROM `'.$Group['TablePrefix'].'` as `sub2` WHERE `sub2`.`Language` = 0 AND `T`.`Entry` = `sub2`.`Entry` AND `T`.`VersionStart` = `sub2`.`VersionStart`)'.
       ' ';  //LIMIT 1000
-      //echo $sql;
       $DbResult = $this->System->Database->query($sql);
       echo ': <br />'.$Group['TablePrefix'].': <br />';
@@ -161 +160 @@
       ' WHERE `T`.`Language` = 0 '.
       ' ORDER BY `T`.`VersionStart`';  //LIMIT 1000
-      //echo $sql;
       $DbResult = $this->System->Database->query($sql);
       echo ': <br />'.$Group['TablePrefix'].': ';
@@ -169 +167 @@
             ' WHERE  `T`.`Language` = 0 AND `T`.`VersionStart` > '.$line['VersionEnd'].' AND `T`.`Entry` = '.$line['Entry'].
             ' ORDER BY `T`.`VersionStart` LIMIT 1';  //LIMIT 1000
-        //   echo $sql;
         $DbResult2 = $this->System->Database->query($sql);
-        if ($DbResult2->num_rows > 0) {
+        if ($DbResult2->num_rows > 0)
+        {
           $line2 = $DbResult2->fetch_assoc();
 
           $Same = true;
-          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column) {
+          foreach ($TranslationTree[$Group['Id']]['Items'] as $Column)
+          {
             if ($this->StripText($line[$Column['Column']]) <> $this->StripText($line2[$Column['Column']]))
               $Same = false;
           }
-          if ($Same) {
+          if ($Same)
+          {
             echo $line['ID'].'='.$line2['ID'].' (';
             //       $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `Take` = NULL WHERE ID='.$line2['ID']);
@@ -186 +186 @@
                 ' WHERE `T`.`Entry` = '.$line['Entry'].' AND (`T`.`Take` = '.$line['ID'].' OR `T`.`Take` = '.$line2['ID'].') ';
             $DbResult3 = $this->System->Database->query($sql);
-            while ($line3 = $DbResult3->fetch_assoc()) {
+            while ($line3 = $DbResult3->fetch_assoc())
+            {
               echo $line3['ID'].' ';
               $this->System->Database->query('UPDATE `'.$Group['TablePrefix'].'` SET `VersionEnd` = '.$line2['VersionEnd'].', `VersionStart` = '.$line['VersionStart'].', `Take` = '.$line['ID'].' WHERE ID='.$line3['ID']);
@@ -207 +208 @@
 
     $Output = '';
-    if (array_key_exists('GameVersion', $_GET)) {
+    if (array_key_exists('GameVersion', $_GET))
+    {
       $_SESSION['GameVersion'] = $_GET['GameVersion'];
     }
@@ -221 +223 @@
         $Output .= 'vloženo <br />';
       }
-      if (array_key_exists('id', $_GET)) {
+      if (array_key_exists('id', $_GET))
+      {
         $Group = $TranslationTree[$_GET['id']];
         //  $Output .= '<form action="?action=dbcstructure&amp;id='.$Group['Id'].'">';
@@ -242 +245 @@
         $Line = $File->ReadLine();
 
-        for ($i = 0; $i < substr_count($Line, ','); $i++) {
+        for ($i = 0; $i < substr_count($Line, ','); $i++)
+        {
           $Output .= $i;
           $Output .= '</td><td>';
         }
         $Output .= '</td></tr><tr><td>';
-        for ($i = 0; $i < substr_count($Line, ','); $i++) {
+        for ($i = 0; $i < substr_count($Line, ','); $i++)
+        {
           foreach ($Group['Items'] as $GroupItem)
             $Output .=   ' <a href="'.$this->System->Link('/admin/?action=dbcstructure&amp;id='.
@@ -259 +264 @@
         $Output .= str_replace(',', '</td><td>', $Line);
         $Output .= '</td></tr><tr><td>';
-        for ($i = 0; $i < 50; $i++) {
+        for ($i = 0; $i < 50; $i++)
+        {
           $Line = $File->ReadLine();
           $Output .= str_replace(',', '</td><td>', $Line);
@@ -267 +273 @@
         $Output .= '</td></tr>';
         $Output .= '</table>';
-      } else {
+      } else
+      {
         $DbResult = $this->System->Database->query('SELECT * FROM `ClientVersion`');
         while ($Version = $DbResult->fetch_assoc())