Changeset 533 for trunk/Modules/User

Timestamp:

Apr 24, 2013, 10:10:33 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Ukládání položek ve správě dat.
• Opraveno: Kontrola oprávnění při zobrazení aktualit.
• Opraveno: Zobrazení seznamu uživatelů a jejich přidružených počítačů i v případě, že jednomu uživateli je přidruženo více zákazníků.

Location:

trunk/Modules/User

Files:

• User.php (modified) (2 diffs)
• UserList.php (modified) (1 diff)

trunk/Modules/User/User.php

@@ -108 +108 @@
   function Register($Login, $Password, $Password2, $Email, $Name, $PhoneNumber, $ICQ)
   {
-    global $Config;
-
     if(($Email == '') || ($Login == '') || ($Password == '') || ($Password2 == '')  || ($Name == '')) $Result = DATA_MISSING;
     else if($Password != $Password2) $Result = PASSWORDS_UNMATCHED;
@@ -333 +331 @@
   function PasswordRecoveryRequest($Login, $Email)
   {
-    global $Config;
-
     $DbResult = $this->Database->select('User', 'Login, Name, Id, Email, Password', '`Login`="'.$Login.'" AND `Email`="'.$Email.'"');
     if($DbResult->num_rows > 0)

trunk/Modules/User/UserList.php

@@ -36 +36 @@
         else $User['PhoneNumber'] = ' ';
 
-      $DbResult2 = $this->Database->query('SELECT Name, Id FROM NetworkDevice WHERE Member = (SELECT Id FROM Member WHERE Member.ResponsibleUser = '.$User['Id'].') AND Used=1 ORDER BY Name');
       $Devices = array();
-      while($Device = $DbResult2->fetch_assoc())
+      $DbResult2 = $this->Database->query('SELECT `Id` FROM `Member` WHERE `Member`.`ResponsibleUser` = '.$User['Id']);
+      while($Member = $DbResult2->fetch_assoc())
       {
-        $Devices[] = $Device['Name'];
+        $DbResult3 = $this->Database->query('SELECT `Name`, `Id` FROM `NetworkDevice` '.
+          'WHERE `Member` = '.$Member['Id'].' AND `Used`=1 ORDER BY `Name`');
+        while($Device = $DbResult3->fetch_assoc())
+        {
+          $Devices[] = $Device['Name'];
+        }
       }
       $User['Devices'] = implode(', ', $Devices);