Changeset 440


Ignore:
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:
19 edited

Legend:

Unmodified
Added
Removed
  • trunk/Common/Forms.php

    r439 r440  
    11<?php
    22
    3 include_once('../form_classes.php');
    4 include_once('Database.php');
     3include_once(dirname(__FILE__).'/../form_classes.php');
     4include_once(dirname(__FILE__).'/Database.php');
    55
    66class Form
  • trunk/ToDo.txt

    r423 r440  
    1414- Automatické zálohování nastavení z routerů
    1515- Vytvořit solidní speedtest se záznamem měření
     16- Předělat anonyma z určitého id na NULL ve tříde User
  • trunk/aktuality/news.php

    r439 r440  
    3232          $URL = substr($Content, 0, strpos($Content, '<'));
    3333          else $URL = substr($Content, 0);
    34         echo('['.$URL.']');
    3534        $Result .= '<a href="'.$URL.'">'.$URL.'</a>';
    3635        $Content = substr($Content, strlen($URL));
  • trunk/form_classes.php

    r436 r440  
    195195    ),
    196196  ),
    197   'NewPayment' => array(
    198     'Title' => 'Nová platba',
    199     'Items' => array(
    200       'DocumentLine' => array('Type' => 'TDocumentLine', 'Caption' => 'Dokladová řada', 'Default' => 3),
    201       'Time' => array('Type' => 'Time', 'Caption' => 'Čas', 'Default' => 'Now'),
    202       'Subject' => array('Type' => 'TFinanceSubject', 'Caption' => 'Subjekt', 'Default' => 0),
    203       'Value' => array('Type' => 'Float', 'Caption' => 'Částka [Kč]', 'Default' => '0'),
    204       'Text' => array('Type' => 'String', 'Caption' => 'Popis', 'Default' => 'Vklad'),
    205       'Cash' => array('Type' => 'Boolean', 'Caption' => 'Hotovost', 'Default' => '0'),
    206       'Taxable' => array('Type' => 'Boolean', 'Caption' => 'Ovlivňující daňový základ', 'Default' => '1'),
    207       //'BankAccount' => array('Type' => 'TBankAccount', 'Caption' => 'Bankovní účet', 'Default' => '1'),
     197  'Product' => array(
     198    'Title' => 'Zboží',
     199    'Table' => 'Product',
     200    'DefaultSortColumn' => 'Name',
     201    'Items' => array(
     202      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
     203      'Price' => array('Type' => 'Integer', 'Caption' => 'Cena', 'Default' => '0'),
     204      'Count' => array('Type' => 'Integer', 'Caption' => 'Počet', 'Default' => ''),
     205      'Date' => array('Type' => 'Date', 'Caption' => 'Datum', 'Default' => ''),
     206      'Segment' => array('Type' => 'TNetworkSegment', 'Caption' => 'Úsek', 'Default' => ''),
     207      'Used' => array('Type' => 'Boolean', 'Caption' => 'Použito', 'Default' => '0'),
     208      'Info' => array('Type' => 'Text', 'Caption' => 'Informace', 'Default' => ''),
     209      'User' => array('Type' => 'TMember', 'Caption' => 'Uživatel', 'Default' => ''),
     210      'Consumption' => array('Type' => 'Integer', 'Caption' => 'Spotřeba', 'Default' => ''),
     211      'DeviceId' => array('Type' => 'String', 'Caption' => 'Označení', 'Default' => ''),
     212      'DeprecatedPrice' => array('Type' => 'Float', 'Caption' => 'Odpisová cena', 'Default' => ''),
     213      'StockCard' => array('Type' => 'TStockCard', 'Caption' => 'Zboží', 'Default' => ''),
     214    ),
     215  ),
     216  'NetworkSubnet' => array(
     217    'Title' => 'Podsítě',
     218    'DefaultSortColumn' => 'Name',
     219    'Table' => 'NetworkSubnet',
     220    'Items' => array(
     221      'Name' => array('Type' => 'String', 'Caption' => 'Jméno', 'Default' => ''),
     222      'AddressRange' => array('Type' => 'String', 'Caption' => 'Rozsah adres', 'Default' => ''),
     223      'Mask' => array('Type' => 'Integer', 'Caption' => 'Prefix', 'Default' => ''),
     224      'DHCP' => array('Type' => 'String', 'Caption' => 'DHCP', 'Default' => ''),
     225      'Gateway' => array('Type' => 'String', 'Caption' => 'Brána', 'Default' => ''),
     226      'WINS' => array('Type' => 'String', 'Caption' => 'WINS', 'Default' => ''),
     227      'DNS' => array('Type' => 'String', 'Caption' => 'DNS', 'Default' => ''),
     228      'Domain' => array('Type' => 'String', 'Caption' => 'Doména', 'Default' => ''),
     229      'NTP' => array('Type' => 'String', 'Caption' => 'NTP', 'Default' => ''),
     230      'Member' => array('Type' => 'TMember', 'Caption' => 'Zákazník', 'Default' => ''),
     231      'ExtAddressRange' => array('Type' => 'String', 'Caption' => 'Vnější rozsah adres', 'Default' => ''),
     232      'ExtMask' => array('Type' => 'String', 'Caption' => 'Vnější prefix', 'Default' => ''),
     233      'AddressRangeIPv6' => array('Type' => 'String', 'Caption' => 'Rozsah adres IPv6', 'Default' => ''),
     234      'Configure' => array('Type' => 'Boolean', 'Caption' => 'Nastavovat', 'Default' => ''),
    208235    ),
    209236  ),
  • trunk/is/index.php

    r438 r440  
    2828   
    2929    if(array_key_exists('t', $_GET)) $_SESSION['Table'] = $_GET['t'];
     30    if(!array_key_exists('Table', $_SESSION)) $_SESSION['Table'] = '';
    3031    if(array_key_exists('a', $_GET)) $_SESSION['Action'] = $_GET['a'];
    3132    if(array_key_exists('id', $_GET)) $_SESSION['Id'] = $_GET['id'];
  • trunk/system/generators/address_portability.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include('../../../Global.php');
     4include('../../Common/Global.php');
    55include('../routerboard.php');
    66$Path = array('ip', 'dhcp-server', 'lease');
  • trunk/system/generators/common.php

    r288 r440  
    11<?php
    22
    3 include_once('../../network_address.php');
     3include_once('../../Common/NetworkAddress.php');
    44
    55function GetMarkByComment($Comment)
  • trunk/system/generators/dhcp.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include('../../../Global.php');
     4include('../../Common/Global.php');
    55include('../routerboard.php');
    66$Path = array('ip', 'dhcp-server', 'lease');
  • trunk/system/generators/dns.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include_once('../../../Global.php');
     4include('../../Common/Global.php');
    55
    66$BaseDomain = 'zdechov.net';
  • trunk/system/generators/firewall_filter.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include('../../../Global.php');
     4include('../../Common/Global.php');
    55include('../routerboard.php');
    66include('common.php');
  • trunk/system/generators/firewall_mangle.php

    r438 r440  
    55$ClassesEnabled = 1;
    66$SessionDisable = true;
    7 include_once('../../../Global.php');
     7include('../../Common/Global.php');
    88include('../routerboard.php');
    99include('common.php');
  • trunk/system/generators/firewall_nat.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include('../../../Global.php');
     4include('../../Common/Global.php');
    55include('../routerboard.php');
    66include('common.php');
  • trunk/system/generators/generate.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include('../../../Global.php');
     4include('../../Common/Global.php');
    55
    66$Now = time();
  • trunk/system/generators/linux/iptables.php

    r439 r440  
    11<?php
    22if(isset($_SERVER['REMOTE_ADDR'])) die();
    3 include_once('../../Common/Global.php');
     3include_once('../../../Common/Global.php');
    44
    55// Generate firewall rules
  • trunk/system/generators/linux/nat.php

    r438 r440  
    11<?php
    22if(isset($_SERVER['REMOTE_ADDR'])) die();
    3 include_once('../../Common/Global.php');
     3include_once('../../../Common/Global.php');
    44
    55// Generate firewall rules
  • trunk/system/generators/linux/traffic_shaping.php

    r438 r440  
    55$Enabled = 1;
    66$ClassesEnabled = 1;
    7 include_once('../../Common/Global.php');
     7include_once('../../../Common/Global.php');
    88NactiMesicniParametry(0);
    99
  • trunk/system/generators/netwatch.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include('../../../Global.php');
     4include('../../Common/Global.php');
    55include('../routerboard.php');
    66$Path = array('tool', 'netwatch');
  • trunk/system/generators/netwatch_import.php

    r438 r440  
    22
    33if(isset($_SERVER['REMOTE_ADDR'])) die();
    4 include('../../../Global.php');
     4include('../../Common/Global.php');
    55include('../routerboard.php');
    66include('common.php');
  • trunk/system/generators/queue.php

    r438 r440  
    55$ClassesEnabled = 1;
    66$SessionDisable = true;
    7 include_once('../../../Global.php');
     7include('../../Common/Global.php');
    88include('../routerboard.php');
    99include('common.php');
Note: See TracChangeset for help on using the changeset viewer.