Changeset 892 for trunk/Modules/User/Options.php

Timestamp:

Mar 3, 2023, 11:36:26 PM (15 months ago)

Author:

chronos

Message:

• Fixed: User profile and options in case of incorrectly set null user info.

File:

• trunk/Modules/User/Options.php (modified) (4 diffs)

trunk/Modules/User/Options.php

@@ -15 +15 @@
     <tr><td>'.T('After save translation redirect to').': </td><td>';
     $Output .= '<select name="redirecting">'.
-        '<option value="0">'.T('Nowhere').'</option>'.
-        '<option value="1"';
+      '<option value="0">'.T('Nowhere').'</option>'.
+      '<option value="1"';
     if ($this->System->User->Redirecting == '1') $Output .= ' selected="selected"';
     $Output .= '>'.T('To untranslated').'</option>';
@@ -36 +36 @@
     $DbResult = $this->Database->query($Query);
     $Output .= T('User obey selected rules').':</td><td>';
-    while ($UserTag = $DbResult->fetch_array()) {
-     $Query = 'SELECT * FROM `UserTag` '.
-     //'LEFT JOIN `UserTagType` ON `UserTagType`.`ID` = `UserTag`.`UserTagType` '.
-     'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
+    while ($UserTag = $DbResult->fetch_array()) 
+    {
+      $Query = 'SELECT * FROM `UserTag` '.
+      //'LEFT JOIN `UserTagType` ON `UserTagType`.`ID` = `UserTag`.`UserTagType` '.
+      'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
       $DbResult2 = $this->Database->query($Query);
       if ($DbResult2->num_rows != 0) $checked = true;
-      else  $checked = false;
+        else $checked = false;
 
       $Output .= CheckBox('Tag'.$UserTag['ID'], $checked, 'CheckBox');
@@ -50 +51 @@
 
     $Output .= '<tr><td colspan="2"><input type="submit" value="'.T('Save').'" /></td></tr>'.
-        '</table></fieldset>'.
-        '</form>';
+      '</table></fieldset>'.
+      '</form>';
 
     $Output .= '<fieldset><legend>'.T('Translation team').'</legend>';
     $DbResult = $this->Database->query('SELECT `Id`, `Name` FROM `Team`');
     $Output .= '<a href="'.$this->System->Link('/team/?action=create').'">'.T('Create team').'</a><br />'.
-        '<a href="'.$this->System->Link('/team/?action=leave').'">'.T('Leave team').'</a><br />'.
-        '<br /><form action="'.$this->System->Link('/team/').'" method="get">'.
-        '<input type="hidden" name="action" value="gointeam"/>'.
-        '<select name="id">';
+      '<a href="'.$this->System->Link('/team/?action=leave').'">'.T('Leave team').'</a><br />'.
+      '<br /><form action="'.$this->System->Link('/team/').'" method="get">'.
+      '<input type="hidden" name="action" value="gointeam"/>'.
+      '<select name="id">';
     while ($LineTeam = $DbResult->fetch_assoc())
     {
@@ -107 +108 @@
       $Query = 'SELECT * FROM UserTagType';
       $DbResult = $this->Database->query($Query);
-      while ($UserTag = $DbResult->fetch_array()) {
-       if (array_key_exists('Tag'.$UserTag['ID'], $_POST)) {
-         $Query = 'SELECT * FROM `UserTag` '.
-         'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
-         $DbResult2 = $this->Database->query($Query);
-         if ($DbResult2->num_rows == 0) {
-           $Query = 'INSERT INTO `UserTag` (`ID` ,`UserTagType`,`User` ) '.
-           'VALUES (NULL, '.$UserTag['ID'].' , '.($this->System->User->Id * 1).')';
-           $DbResult2 = $this->Database->query($Query);
-         }
-       } else {
-         $Query = 'DELETE FROM `UserTag` '.
-         'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
-         $DbResult2 = $this->Database->query($Query);
-       }
+      while ($UserTag = $DbResult->fetch_array()) 
+      {
+        if (array_key_exists('Tag'.$UserTag['ID'], $_POST)) 
+        {
+          $Query = 'SELECT * FROM `UserTag` '.
+            'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
+          $DbResult2 = $this->Database->query($Query);
+          if ($DbResult2->num_rows == 0) 
+          {
+            $Query = 'INSERT INTO `UserTag` (`ID` ,`UserTagType`,`User` ) '.
+              'VALUES (NULL, '.$UserTag['ID'].' , '.($this->System->User->Id * 1).')';
+            $DbResult2 = $this->Database->query($Query);
+          }
+        } else 
+        {
+          $Query = 'DELETE FROM `UserTag` '.
+            'WHERE `UserTagType` = '.$UserTag['ID'].' AND `User` = '.($this->System->User->Id * 1);
+          $DbResult2 = $this->Database->query($Query);
+        }
       }