Changeset 443 for trunk/index.php

Timestamp:

Oct 14, 2012, 10:10:16 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Zobrazování cesty k skriptu ve kterém došlo k chybě.
• Opraveno: Změna hesla v nastavení uživatele. Negenerovalo se správné hashované heslo.
• Odstraněno: Sloupec zobrazující CZFree IP adresu v seznamu registrovaných počítačů uživatelů.
• Opraveno: Ukldádání Země v fakturační adrese zákazníka.

File:

• trunk/index.php (modified) (3 diffs)

trunk/index.php

@@ -179 +179 @@
         $UserOptions = new Form('UserOptions', array());
         $UserOptions->LoadValuesFromForm();
+        if($UserOptions->Values['Password'] == '') unset($UserOptions->Values['Password']);
+        else {
+          $PasswordHash = new PasswordHash();
+          $Salt = $PasswordHash->GetSalt();
+          $UserOptions->Values['Password'] = $PasswordHash->Hash($UserOptions->Values['Password'], $Salt);
+          $UserOptions->Values['Salt'] = $Salt;
+          $this->Database->update('User', 'Id='.$this->System->Modules['User']->User['Id'], array('Salt' => $Salt));
+        }
         $UserOptions->SaveValuesToDatabase($this->System->Modules['User']->User['Id']);
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení uloženo.');
@@ -240 +248 @@
           $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, '.
             'Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, '.
-            'Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
+            'Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject '.
            'ON Subject.Id = Member.Subject WHERE Member.Id='.$CustomerUserRel['Customer']);        
           $DbRow = $DbResult->fetch_array();
@@ -263 +271 @@
         $DbResult = $this->Database->query('SELECT Subject FROM Member WHERE Id='.$this->System->Modules['User']->User['Member']);
         $Member = $DbResult->fetch_assoc();
-        $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'], array('Name' => $UserOptions->Values['Name'], 'AddressStreet' => $UserOptions->Values['AddressStreet'], 'AddressTown' => $UserOptions->Values['AddressTown'], 'AddressPSC' => $UserOptions->Values['AddressPSC'], 'IC' => $UserOptions->Values['IC'], 'DIC' => $UserOptions->Values['DIC']));
+        $DbResult = $this->Database->update('Subject', 'Id='.$Member['Subject'], 
+          array('Name' => $UserOptions->Values['Name'], 'AddressStreet' => $UserOptions->Values['AddressStreet'], 
+          'AddressTown' => $UserOptions->Values['AddressTown'], 'AddressCountry' => $UserOptions->Values['AddressCountry'],
+          'AddressPSC' => $UserOptions->Values['AddressPSC'], 'IC' => $UserOptions->Values['IC'], 
+          'DIC' => $UserOptions->Values['DIC']));
         $Output .= $this->SystemMessage('Nastavení', 'Nastavení domácnosti uloženo.');
         $this->System->Modules['Log']->NewRecord('Member+Subject', 'Nastavení člena/subjektu změněno', $UserOptions->Values['Name']);
-        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
+        $DbResult = $this->Database->query('SELECT Member.Id, Member.InternetTariffNextMonth, Member.FamilyMemberCount, Member.BillingPeriodNext, Subject.Name, Subject.AddressStreet, Subject.AddressTown, Subject.AddressPSC, Subject.AddressCountry, Subject.IC, Subject.DIC FROM Member JOIN Subject ON Subject.Id = Member.Subject WHERE Member.Id='.$this->System->Modules['User']->User['Member']);
         $DbRow = $DbResult->fetch_array();
         foreach($UserOptions->Definition['Items'] as $Index => $Item)