Changeset 440 for trunk

Timestamp:

Oct 13, 2012, 6:28:45 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Cesta k jednotce Global z generovacích skriptů.

Location:

trunk

Files:

• Common/Forms.php (modified) (1 diff)
• ToDo.txt (modified) (1 diff)
• aktuality/news.php (modified) (1 diff)
• form_classes.php (modified) (1 diff)
• is/index.php (modified) (1 diff)
• system/generators/address_portability.php (modified) (1 diff)
• system/generators/common.php (modified) (1 diff)
• system/generators/dhcp.php (modified) (1 diff)
• system/generators/dns.php (modified) (1 diff)
• system/generators/firewall_filter.php (modified) (1 diff)
• system/generators/firewall_mangle.php (modified) (1 diff)
• system/generators/firewall_nat.php (modified) (1 diff)
• system/generators/generate.php (modified) (1 diff)
• system/generators/linux/iptables.php (modified) (1 diff)
• system/generators/linux/nat.php (modified) (1 diff)
• system/generators/linux/traffic_shaping.php (modified) (1 diff)
• system/generators/netwatch.php (modified) (1 diff)
• system/generators/netwatch_import.php (modified) (1 diff)
• system/generators/queue.php (modified) (1 diff)

trunk/Common/Forms.php

@@ -1 +1 @@
 <?php
 
-include_once('../form_classes.php');
-include_once('Database.php');
+include_once(dirname(__FILE__).'/../form_classes.php');
+include_once(dirname(__FILE__).'/Database.php');
 
 class Form

trunk/ToDo.txt

@@ -14 +14 @@
 - Automatické zálohování nastavení z routerů
 - Vytvořit solidní speedtest se záznamem měření
+- Předělat anonyma z určitého id na NULL ve tříde User

trunk/aktuality/news.php

@@ -32 +32 @@
           $URL = substr($Content, 0, strpos($Content, '<'));
           else $URL = substr($Content, 0);
-        echo('['.$URL.']');
         $Result .= '<a href="'.$URL.'">'.$URL.'</a>';
         $Content = substr($Content, strlen($URL));

trunk/form_classes.php

@@ -195 +195 @@
     ),
   ),
-  'NewPayment' => array(
-    'Title' => 'Nová platba',
-    'Items' => array(
-      'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => 3),
-      'Time' => array('Type' => 'Time', 'Caption' => 'Čas', 'Default' => 'Now'),
-      'Subject' => array('Type' => 'TFinanceSubject', 'Caption' => 'Subjekt', 'Default' => 0),
-      'Value' => array('Type' => 'Float', 'Caption' => 'Částka [Kč]', 'Default' => '0'),
-      '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'),
+  'Product' => array(
+    'Title' => 'Zboží',
+    'Table' => 'Product',
+    'DefaultSortColumn' => 'Name',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      'Price' => array('Type' => 'Integer', 'Caption' => 'Cena', 'Default' => '0'),
+      'Count' => array('Type' => 'Integer', 'Caption' => 'Počet', 'Default' => ''),
+      'Date' => array('Type' => 'Date', 'Caption' => 'Datum', 'Default' => ''),
+      'Segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Úsek', 'Default' => ''),
+      'Used' => array('Type' => 'Boolean', 'Caption' => 'Použito', 'Default' => '0'),
+      'Info' => array('Type' => 'Text', 'Caption' => 'Informace', 'Default' => ''),
+      'User' => array('Type' => 'TMember', 'Caption' => 'Uživatel', 'Default' => ''),
+      'Consumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba', 'Default' => ''),
+      'DeviceId' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
+      'DeprecatedPrice' => array('Type' => 'Float', 'Caption' => 'Odpisová cena', 'Default' => ''),
+      'StockCard' => array('Type' => 'TStockCard', 'Caption' => 'Zboží', 'Default' => ''),
+    ),
+  ),
+  'NetworkSubnet' => array(
+    'Title' => 'Podsítě',
+    'DefaultSortColumn' => 'Name',
+    'Table' => 'NetworkSubnet',
+    'Items' => array(
+      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
+      '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' => ''),
+      'DNS' => array('Type' => 'String', 'Caption' => 'DNS', 'Default' => ''),
+      'Domain' => array('Type' => 'String', 'Caption' => 'Doména', 'Default' => ''),
+      'NTP' => array('Type' => 'String', 'Caption' => 'NTP', 'Default' => ''),
+      'Member' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => ''),
+      'ExtAddressRange' => array('Type' => 'String', 'Caption' => 'Vnější rozsah adres', 'Default' => ''),
+      'ExtMask' => array('Type' => 'String', 'Caption' => 'Vnější prefix', 'Default' => ''),
+      'AddressRangeIPv6' => array('Type' => 'String', 'Caption' => 'Rozsah adres IPv6', 'Default' => ''),
+      'Configure' => array('Type' => 'Boolean', 'Caption' => 'Nastavovat', 'Default' => ''),
     ),
   ),

trunk/is/index.php

@@ -28 +28 @@
     
     if(array_key_exists('t', $_GET)) $_SESSION['Table'] = $_GET['t'];
+    if(!array_key_exists('Table', $_SESSION)) $_SESSION['Table'] = '';
     if(array_key_exists('a', $_GET)) $_SESSION['Action'] = $_GET['a'];
     if(array_key_exists('id', $_GET)) $_SESSION['Id'] = $_GET['id'];

trunk/system/generators/address_portability.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 $Path = array('ip', 'dhcp-server', 'lease');

trunk/system/generators/common.php

@@ -1 +1 @@
 <?php
 
-include_once('../../network_address.php');
+include_once('../../Common/NetworkAddress.php');
 
 function GetMarkByComment($Comment)

trunk/system/generators/dhcp.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 $Path = array('ip', 'dhcp-server', 'lease');

trunk/system/generators/dns.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../../Global.php');
+include('../../Common/Global.php');
 
 $BaseDomain = 'zdechov.net';

trunk/system/generators/firewall_filter.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 include('common.php');

trunk/system/generators/firewall_mangle.php

@@ -5 +5 @@
 $ClassesEnabled = 1;
 $SessionDisable = true;
-include_once('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 include('common.php');

trunk/system/generators/firewall_nat.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 include('common.php');

trunk/system/generators/generate.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../../Global.php');
+include('../../Common/Global.php');
 
 $Now = time();

trunk/system/generators/linux/iptables.php

@@ -1 +1 @@
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../Common/Global.php');
+include_once('../../../Common/Global.php');
 
 // Generate firewall rules

trunk/system/generators/linux/nat.php

@@ -1 +1 @@
 <?php
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include_once('../../Common/Global.php');
+include_once('../../../Common/Global.php');
 
 // Generate firewall rules

trunk/system/generators/linux/traffic_shaping.php

@@ -5 +5 @@
 $Enabled = 1;
 $ClassesEnabled = 1;
-include_once('../../Common/Global.php');
+include_once('../../../Common/Global.php');
 NactiMesicniParametry(0);
 

trunk/system/generators/netwatch.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 $Path = array('tool', 'netwatch');

trunk/system/generators/netwatch_import.php

@@ -2 +2 @@
 
 if(isset($_SERVER['REMOTE_ADDR'])) die();
-include('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 include('common.php');

trunk/system/generators/queue.php

@@ -5 +5 @@
 $ClassesEnabled = 1;
 $SessionDisable = true;
-include_once('../../../Global.php');
+include('../../Common/Global.php');
 include('../routerboard.php');
 include('common.php');