Changeset 605 for trunk/Modules

Timestamp:

Dec 8, 2013, 4:38:25 PM (11 years ago)

Author:

chronos

Message:

• Přidáno: Podpora pro ověřování zadaných dat pro IPv4, IPv6 a MAC adresu.

Location:

trunk/Modules

Files:

• Finance/Finance.php (modified) (1 diff)
• IS/IS.php (modified) (2 diffs)
• Network/Network.php (modified) (2 diffs)
• News/News.php (modified) (1 diff)
• User/User.php (modified) (1 diff)

trunk/Modules/Finance/Finance.php

@@ -325 +325 @@
     $this->System->RegisterPage(array('finance', 'zivnost'), 'PageFinanceTaxFiling');
 
-    $this->System->FormManager->RegisterClass('NewPayment', array(
-      'Title' => 'Nová platba',
-      'Items' => array(
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => 3),
-        'Time' => array('Type' => 'Date', 'Caption' => 'Čas', 'Default' => 'Now'),
-        'Subject' => array('Type' => 'TFinanceSubject', 'Caption' => 'Subjekt', 'Default' => 0),
-        'Value' => array('Type' => 'Float', 'Caption' => 'Částka [Kč]', 'Default' => '0', 'Suffix' => 'Kč'),
-        'Text' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => 'Vklad'),
-        'Cash' => array('Type' => 'Boolean', 'Caption' => 'Hotovost', 'Default' => '0'),
-        'Taxable' => array('Type' => 'Boolean', 'Caption' => 'Ovlivňující daňový základ', 'Default' => '1'),
-        //'BankAccount' => array('Type' => 'TBankAccount', 'Caption' => 'Bankovní účet', 'Default' => '1'),
-      ),
-    ));
-    $this->System->FormManager->RegisterClass('NewInvoice', array(
-      'Title' => 'Nová faktura',
-      'Items' => array(
-        'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => 5),
-        'TimeCreation' => array('Type' => 'Date', 'Caption' => 'Čas vytvoření', 'Default' => 'Now'),
-        'TimeDue' => array('Type' => 'Date', 'Caption' => 'Čas splatnosti', 'Default' => 'Now'),
-        'Subject' => array('Type' => 'TFinanceSubject', 'Caption' => 'Subjekt', 'Default' => 0),
-        'Text' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => 'Nákup zařízení'),
-        'Value' => array('Type' => 'Float', 'Caption' => 'Částka [Kč]', 'Default' => '0', 'Suffix' => 'Kč'),
-        //'Items' => array('Type' => 'Array', 'Caption' => 'Položky', 'ItemClass' => 'FinanceInvoiceItem'),
-      ),
-    ));
     $this->System->FormManager->RegisterClass('FinanceOperation', array(
       'Title' => 'Finanční operace',

trunk/Modules/IS/IS.php

@@ -84 +84 @@
         $Form->LoadValuesFromForm();
         try {
+          $Form->Validate();
           $Form->SaveValuesToDatabase($Id);
           $Output .= $this->SystemMessage('Úprava položky', 'Položka upravena');
@@ -143 +144 @@
         $Form = new Form($this->System->FormManager);
         $Form->SetClass($Table);
-        $Form->LoadValuesFromForm();
+        $Form->LoadValuesFromForm();       
         try {
+          $Form->Validate();
           if(array_key_exists('BeforeInsert', $Form->Definition))
           {

trunk/Modules/Network/Network.php

@@ -201 +201 @@
             'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
             'Type' => array('Type' => 'TNetworkInterfaceType', 'Caption' => 'Typ', 'Default' => '0'),
-            'MAC' => array('Type' => 'String', 'Caption' => 'Fyzická adresa (MAC)', 'Default' => ''),
-            'LocalIP' => array('Type' => 'String', 'Caption' => 'IPv4', 'Default' => ''),
-            'IPv6' => array('Type' => 'String', 'Caption' => 'IPv6', 'Default' => ''),
-            'ExternalIP' => array('Type' => 'String', 'Caption' => 'Veřejná IPv4', 'Default' => ''),
+            'MAC' => array('Type' => 'MacAddress', 'Caption' => 'Fyzická adresa (MAC)', 'Default' => ''),
+            'LocalIP' => array('Type' => 'IPv4Address', 'Caption' => 'IPv4', 'Default' => ''),
+            'IPv6' => array('Type' => 'IPv6Address', 'Caption' => 'IPv6', 'Default' => '', 'Null' => true),
+            'ExternalIP' => array('Type' => 'IPv4Address', 'Caption' => 'Veřejná IPv4', 'Default' => '', 'Null' => true),
             'Device' => array('Type' => 'TNetworkDevice', 'Caption' => 'Zařízení', 'Default' => ''),
             'Online' => array('Type' => 'Boolean', 'Caption' => 'Běží', 'Default' => '0', 'ReadOnly' => true),
@@ -230 +230 @@
             'AddressRange' => array('Type' => 'String', 'Caption' => 'Rozsah adres', 'Default' => ''),
             'Mask' => array('Type' => 'Integer', 'Caption' => 'Prefix', 'Default' => ''),
-            'DHCP' => array('Type' => 'String', 'Caption' => 'DHCP', 'Default' => ''),
-            'Gateway' => array('Type' => 'String', 'Caption' => 'Brána', 'Default' => ''),
-            'WINS' => array('Type' => 'String', 'Caption' => 'WINS', 'Default' => ''),
+            'DHCP' => array('Type' => 'IPv4Address', 'Caption' => 'DHCP', 'Default' => ''),
+            'Gateway' => array('Type' => 'IPv4Address', 'Caption' => 'Brána', 'Default' => ''),
+            'WINS' => array('Type' => 'IPv4Address', 'Caption' => 'WINS', 'Default' => ''),
             'DNS' => array('Type' => 'String', 'Caption' => 'DNS', 'Default' => ''),
             'Domain' => array('Type' => 'String', 'Caption' => 'Doména', 'Default' => ''),

trunk/Modules/News/News.php

@@ -48 +48 @@
         'Enclosure' => array('Type' => 'String', 'Caption' => 'Přílohy', 'Default' => ''),
         'User' => array('Type' => 'TUser', 'Caption' => 'Uživatel', 'Default' => ''),
-        'IP' => array('Type' => 'String', 'Caption' => 'IP adresa', 'Default' => '', 'ReadOnly' => true),
+        'IP' => array('Type' => 'IPv4Address', 'Caption' => 'IP adresa', 'Default' => '', 'ReadOnly' => true),
         'Link' => array('Type' => 'Hyperlink', 'Caption' => 'Odkaz', 'Default' => ''),
       ),

trunk/Modules/User/User.php

@@ -511 +511 @@
         'Password' => array('Type' => 'Password', 'Caption' => 'Heslo', 'Default' => '', 'Method' => 'DoubleSHA1'),
         'Email' => array('Type' => 'String', 'Caption' => 'E-mail', 'Default' => ''),
-        'LastIpAddress' => array('Type' => 'String', 'Caption' => 'Poslední IP adresa', 'Default' => '', 'ReadOnly' => true),
+        'LastIpAddress' => array('Type' => 'IPv4Address', 'Caption' => 'Poslední IP adresa', 'Default' => '', 'ReadOnly' => true),
         'LastLoginTime' => array('Type' => 'DateTime', 'Caption' => 'Poslední čas přihlášení', 'Default' => '', 'ReadOnly' => true),
         'RegistrationTime' => array('Type' => 'DateTime', 'Caption' => 'Čas registrace', 'Default' => ''),