Changeset 779

Timestamp:

Jan 6, 2016, 11:01:30 PM (9 years ago)

Author:

chronos

Message:

• Moved: Application, Base and AppModule to Common Package.
• Modified: Main application class renamed to Core.

Location:

trunk

Files:

• Application/System.php (modified) (2 diffs)
• Common/Application.php (deleted)
• Common/Global.php (modified) (2 diffs)
• Packages/Common/AppModule.php (moved) (moved from trunk/Common/AppModule.php ) (3 diffs)
• Packages/Common/Application.php (added)
• Packages/Common/Base.php (moved) (moved from trunk/Common/Base.php ) (1 diff)
• Packages/Common/Common.php (modified) (1 diff)
• cmd.php (modified) (1 diff)
• index.php (modified) (1 diff)

trunk/Application/System.php

@@ -4 +4 @@
 if(file_exists($ConfigFileName)) include_once($ConfigFileName);
 
-include_once(dirname(__FILE__).'/../Common/Application.php');
 include_once(dirname(__FILE__).'/Version.php');
 include_once(dirname(__FILE__).'/../Common/Global.php');
 include_once(dirname(__FILE__).'/FormClasses.php');
 
-class System extends Application
+class Core extends Application
 {
-  /** @var Database */
-  var $Database;
-  var $Modules;
   /** @var Type */
   var $Type;
   var $Pages;
   var $Bars;
-  /** @var AppModuleManager */
-  var $ModuleManager;
   /** @var FormManager */
   var $FormManager;
@@ -32 +26 @@
   function __construct()
   {
+    parent::__construct();
     $this->Modules = array();
     $this->Pages = array();
-    $this->ModuleManager = new AppModuleManager($this);
     $this->ModuleManager->FileName = dirname(__FILE__).'/../Config/ModulesConfig.php';
-    $this->Database = new Database();
     $this->FormManager = new FormManager($this->Database);
     $this->ShowPage = true;

trunk/Common/Global.php

@@ -6 +6 @@
 $Database = NULL;
 
-include_once(dirname(__FILE__).'/Base.php');
-include_once(dirname(__FILE__).'/AppModule.php');
+include_once(dirname(__FILE__).'/../Packages/Package.php');
+include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Table.php');
@@ -13 +13 @@
 include_once(dirname(__FILE__).'/Config.php');
 include_once(dirname(__FILE__).'/Setup/Setup.php');
-include_once(dirname(__FILE__).'/../Packages/Package.php');
-include_once(dirname(__FILE__).'/../Packages/Common/Common.php');
 include_once(dirname(__FILE__).'/VCL/General.php');
 include_once(dirname(__FILE__).'/VCL/Database.php');

trunk/Packages/Common/AppModule.php

@@ -190 +190 @@
   var $System;
   var $FileName;
+  var $ModulesDir;
   var $OnLoadModules;
 
@@ -197 +198 @@
     $this->System = &$System;
     $this->FileName = 'Config/Modules.php';
+    $this->ModulesDir = dirname(__FILE__).'/../../Modules';
   }
 
@@ -364 +366 @@
     if(method_exists($this->OnLoadModules[0], $this->OnLoadModules[1]))
       $this->OnLoadModules();
-    else $this->LoadModulesFromDir(dirname(__FILE__).'/../Modules');
-  }
-}
+    else $this->LoadModulesFromDir($this->ModulesDir);
+  }
+}

trunk/Packages/Common/Base.php

@@ -1 +1 @@
 <?php
+
+class System
+{
+  /* @var Database */
+  var $Database;
+
+  function __construct()
+  {
+    $this->Database = new Database();
+  }
+}
 
 class Base
 {
-  /** @var Database */
+  /** @var Application */
+  var $System;
+  /* @var Database */
   var $Database;
-  /** @var System */
-  var $System;
 
-  function __construct($System)
+  function __construct(Application $System)
   {
     $this->System = &$System;

trunk/Packages/Common/Common.php

@@ -9 +9 @@
 include_once(dirname(__FILE__).'/UTF8.php');
 include_once(dirname(__FILE__).'/VarDumper.php');
-
+include_once(dirname(__FILE__).'/Base.php');
+include_once(dirname(__FILE__).'/Application.php');
+include_once(dirname(__FILE__).'/AppModule.php');
 
 class PackageCommon extends Package

trunk/cmd.php

@@ -3 +3 @@
 include_once('Application/System.php');
 
-$System = new System();
+$System = new Core();
 $System->RunCommandLine();

trunk/index.php

@@ -3 +3 @@
 include_once('Application/System.php');
 
-$System = new System();
+$System = new Core();
 $System->Run();