Changeset 443 for trunk

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.

Location:

trunk

Files:

• Common/Error.php (modified) (2 diffs)
• Common/Page.php (modified) (1 diff)
• index.php (modified) (3 diffs)
• network/user_hosts.php (modified) (2 diffs)

trunk/Common/Error.php

@@ -8 +8 @@
   }
   
-  function Handle($Number, $Message, $Filename, $LineNumber, $Variables)
+  function Handle($Number, $Message, $FileName, $LineNumber, $Variables)
   {
   global $Config;
@@ -31 +31 @@
   if(($UserErrors & $Number))
   {
-    $Error = '# '.$Date.' : '.$Message.' on line '.$LineNumber."\n";
+    $Error = '# '.$Date.' : '.$Message.' on line '.$LineNumber.' in '.$FileName."\n";
     $Backtrace = debug_backtrace();
     $Backtrace[0]['function'] = '';

trunk/Common/Page.php

@@ -25 +25 @@
       'dostupnost.php' => 'Dostupnost zařízení',
       'restart.php' => 'Restart služeb',
+      'user_hosts.php' => 'Registrované počítače',
     ),
     'nabidky_pripojeni.php' => 'Nabídky připojení',

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)

trunk/network/user_hosts.php

@@ -13 +13 @@
     
     $Output = '<div align="center" style="font-size: small;"><table class="WideTable">';
-    $Output .= '<tr><th>Jméno počítače</th><th>Místní adresa</th><th>Veřejná adresa</th><th>CZFree adresa</th><th>Fyzická adresa</th><th>Typ</th><th>Naposledy online</th></tr>';
+    $Output .= '<tr><th>Jméno počítače</th><th>Místní adresa</th><th>Veřejná adresa</th><th>Fyzická adresa</th><th>Typ</th><th>Naposledy online</th></tr>';
     $DbResult = $this->Database->query('SELECT NetworkDevice.*, NetworkDeviceType.Name AS HostType FROM NetworkDevice LEFT JOIN NetworkDeviceType ON NetworkDeviceType.Id = NetworkDevice.Type WHERE NetworkDevice.Used = 1 AND NetworkDevice.Member = (SELECT Customer FROM UserCustomerRel WHERE User='.$this->System->Modules['User']->User['Id'].') ORDER BY NetworkDevice.Name');
     while($Device = $DbResult->fetch_assoc())
     {
       if($Device['Online'] == 1) $Style = 'color: blue;'; else $Style = '';
-      $Output .= '<tr><td colspan="5" style="text-align: left; font-weight: bold; '.$Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td></tr>';
+      $Output .= '<tr><td colspan="4" style="text-align: left; font-weight: bold; '.$Style.'">'.$Device['Name'].'</td><td>'.$Device['HostType'].'</td><td style="text-align: right;">'.HumanDate($Device['LastOnline']).'</td></tr>';
       $DbResult2 = $this->Database->query('SELECT * FROM NetworkInterface WHERE Device = '.$Device['Id']);
       while($Interface = $DbResult2->fetch_assoc())
@@ -25 +25 @@
         $InterfaceName = $Device['Name'];
         if($Interface['Name'] != '') $InterfaceName .= '-'.$Interface['Name'];
-        $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.$InterfaceName.'</td><td>'.NotBlank($Interface['LocalIP']).'</td><td>'.NotBlank($Interface['ExternalIP']).'</td><td>'.NotBlank($Interface['CZFreeIP']).'</td><td>'.NotBlank($Interface['MAC']).'</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
+        $Output .= '<tr><td style="text-align: left; '.$Style.'">&nbsp;&nbsp;'.
+          $InterfaceName.'</td><td>'.NotBlank($Interface['LocalIP']).'</td><td>'.
+          NotBlank($Interface['ExternalIP']).'</td><td>'.
+          NotBlank($Interface['MAC']).'</td><td>&nbsp;</td><td>&nbsp;</td></tr>';
       }      
     }