Changeset 364 for trunk


Ignore:
Timestamp:
Jan 19, 2012, 7:30:34 AM (13 years ago)
Author:
chronos
Message:
  • Přesunuto: Obecné soubory do podsložky Common.
  • Obnoveny: Chybějící soubory HostList a UserList.
Location:
trunk
Files:
2 added
1 deleted
5 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/Common/Global.php

    r363 r364  
    11<?php
    22
    3 $ConfigFileName = dirname(__FILE__).'/config.php';
     3$ConfigFileName = dirname(__FILE__).'/../config.php';
    44     
    55if(file_exists($ConfigFileName)) include_once($ConfigFileName);
    66  else die('Nenalezen konfigurační soubor '.$ConfigFileName.'!');
    77 
    8 include_once('Common/Database.php');
    9 include_once('Common/Error.php');
    10 include_once('Common/Code.php');
    11 include_once('Common/Forms.php');
    12 include_once('Common/File.php');
    13 include_once('module.php');
    14 include_once('Modules/page.php');
     8include_once('Database.php');
     9include_once('Error.php');
     10include_once('Code.php');
     11include_once('Forms.php');
     12include_once('File.php');
     13include_once('Page.php');
     14include_once('Module.php');
     15include_once('Model.php');
    1516include_once('finance/bills.php');
    1617include_once('finance/finance.php');
    17 include_once('Modules/Module.php');
    18 include_once('Model.php');
    1918 
    2019$PrefixMultipliers = array
  • trunk/Common/Module.php

    r363 r364  
    11<?php
    22
    3 include_once(dirname(__FILE__).'/../Model.php');
     3include_once(dirname(__FILE__).'/Model.php');
    44
    55class Module
     
    7575    while($Module = $DbResult->fetch_array())
    7676    {
    77       include_once(dirname(__FILE__).'/'.$Module['Name'].'/'.$Module['Name'].'.php');
     77      include_once('Modules/'.$Module['Name'].'/'.$Module['Name'].'.php');
    7878      $ModuleClassName = 'Module'.$Module['Name'];
    7979      $this->Modules[$Module['Name']] = new $ModuleClassName($this->Database, $this);
     
    122122    // Load list of modules on disk
    123123    $ModulesOnDisk = array();
    124     $Files = scandir(dirname(__FILE__));
     124    $Files = scandir('Modules');
    125125    foreach($Files as $File)
    126     if(is_dir(dirname(__FILE__).'/'.$File) and ($File != '.') and ($File != '..') and (substr($File, 0, 1) != '.'))
     126    if(is_dir('Modules/'.$File) and ($File != '.') and ($File != '..') and (substr($File, 0, 1) != '.'))
    127127    {
    128128      $ModulesOnDisk[] = $File;
     
    134134    {
    135135      DebugLog('Adding module '.$ModuleName.' to list');
    136       include_once(dirname(__FILE__).'/'.$ModuleName.'/'.$ModuleName.'.php');
     136      include_once('Modules/'.$ModuleName.'/'.$ModuleName.'.php');
    137137      $ModuleClassName = 'Module'.$ModuleName;
    138138      if(class_exists($ModuleClassName))
  • trunk/Common/Page.php

    r363 r364  
    33define('PAGE_NOT_FOUND', 'Stránka nenalezena');
    44
    5 class Page extends OldModule
     5class Page
    66{
     7  var $Database;
     8  var $System;
     9  var $Config;
    710  var $TimeStart;
    811  var $FormatHTML = false;
  • trunk/Modules/Project/Project.php

    r343 r364  
    11<?php
    2 
    3 include_once(dirname(__FILE__).'/../Module.php');
    4 include_once(dirname(__FILE__).'/../../Model.php');
    52
    63class Project extends Model
  • trunk/Modules/User/User.php

    r363 r364  
    11<?php
    22
    3 include('UserList.php');
     3include(dirname(__FILE__).'/UserList.php');
    44
    55define('LOGIN_USED', 'Přihlašovací jméno již použito.');
  • trunk/finance/bills.php

    r340 r364  
    11<?php
    22
    3 class Bill extends OldModule
     3class Bill
    44{
     5  var $Database;
     6  var $System;
     7  var $Config;
    58  var $SpecificSymbol = 1; // počítačová sít
    69  var $FileFolder = 'doklady';
  • trunk/finance/finance.php

    r340 r364  
    11<?php
    22
    3 class Finance extends OldModule
     3class Finance
    44{
     5  var $Database;
     6  var $Config;
     7  var $System;
     8 
    59  var $kWh;
    610  var $Internet;
  • trunk/index.php

    r358 r364  
    11<?php
    22
    3 include_once('global.php');
     3include_once('Common/Global.php');
    44
    55function ProcessURL()
Note: See TracChangeset for help on using the changeset viewer.