Changeset 779
- Timestamp:
- Jan 6, 2016, 11:01:30 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 1 added
- 1 deleted
- 5 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Application/System.php
r747 r779 4 4 if(file_exists($ConfigFileName)) include_once($ConfigFileName); 5 5 6 include_once(dirname(__FILE__).'/../Common/Application.php');7 6 include_once(dirname(__FILE__).'/Version.php'); 8 7 include_once(dirname(__FILE__).'/../Common/Global.php'); 9 8 include_once(dirname(__FILE__).'/FormClasses.php'); 10 9 11 class Systemextends Application10 class Core extends Application 12 11 { 13 /** @var Database */14 var $Database;15 var $Modules;16 12 /** @var Type */ 17 13 var $Type; 18 14 var $Pages; 19 15 var $Bars; 20 /** @var AppModuleManager */21 var $ModuleManager;22 16 /** @var FormManager */ 23 17 var $FormManager; … … 32 26 function __construct() 33 27 { 28 parent::__construct(); 34 29 $this->Modules = array(); 35 30 $this->Pages = array(); 36 $this->ModuleManager = new AppModuleManager($this);37 31 $this->ModuleManager->FileName = dirname(__FILE__).'/../Config/ModulesConfig.php'; 38 $this->Database = new Database();39 32 $this->FormManager = new FormManager($this->Database); 40 33 $this->ShowPage = true; -
trunk/Common/Global.php
r746 r779 6 6 $Database = NULL; 7 7 8 include_once(dirname(__FILE__).'/ Base.php');9 include_once(dirname(__FILE__).'/ AppModule.php');8 include_once(dirname(__FILE__).'/../Packages/Package.php'); 9 include_once(dirname(__FILE__).'/../Packages/Common/Common.php'); 10 10 include_once(dirname(__FILE__).'/Page.php'); 11 11 include_once(dirname(__FILE__).'/Table.php'); … … 13 13 include_once(dirname(__FILE__).'/Config.php'); 14 14 include_once(dirname(__FILE__).'/Setup/Setup.php'); 15 include_once(dirname(__FILE__).'/../Packages/Package.php');16 include_once(dirname(__FILE__).'/../Packages/Common/Common.php');17 15 include_once(dirname(__FILE__).'/VCL/General.php'); 18 16 include_once(dirname(__FILE__).'/VCL/Database.php'); -
trunk/Packages/Common/AppModule.php
r778 r779 190 190 var $System; 191 191 var $FileName; 192 var $ModulesDir; 192 193 var $OnLoadModules; 193 194 … … 197 198 $this->System = &$System; 198 199 $this->FileName = 'Config/Modules.php'; 200 $this->ModulesDir = dirname(__FILE__).'/../../Modules'; 199 201 } 200 202 … … 364 366 if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1])) 365 367 $this->OnLoadModules(); 366 else $this->LoadModulesFromDir( dirname(__FILE__).'/../Modules');367 } 368 } 368 else $this->LoadModulesFromDir($this->ModulesDir); 369 } 370 } -
trunk/Packages/Common/Base.php
r778 r779 1 1 <?php 2 3 class System 4 { 5 /* @var Database */ 6 var $Database; 7 8 function __construct() 9 { 10 $this->Database = new Database(); 11 } 12 } 2 13 3 14 class Base 4 15 { 5 /** @var Database */ 16 /** @var Application */ 17 var $System; 18 /* @var Database */ 6 19 var $Database; 7 /** @var System */8 var $System;9 20 10 function __construct( $System)21 function __construct(Application $System) 11 22 { 12 23 $this->System = &$System; -
trunk/Packages/Common/Common.php
r746 r779 9 9 include_once(dirname(__FILE__).'/UTF8.php'); 10 10 include_once(dirname(__FILE__).'/VarDumper.php'); 11 11 include_once(dirname(__FILE__).'/Base.php'); 12 include_once(dirname(__FILE__).'/Application.php'); 13 include_once(dirname(__FILE__).'/AppModule.php'); 12 14 13 15 class PackageCommon extends Package -
trunk/cmd.php
r729 r779 3 3 include_once('Application/System.php'); 4 4 5 $System = new System();5 $System = new Core(); 6 6 $System->RunCommandLine(); -
trunk/index.php
r592 r779 3 3 include_once('Application/System.php'); 4 4 5 $System = new System();5 $System = new Core(); 6 6 $System->Run();
Note:
See TracChangeset
for help on using the changeset viewer.