Changeset 505 for trunk/Common

Timestamp:

Apr 1, 2013, 12:29:37 AM (12 years ago)

Author:

chronos

Message:

• Upraveno: Procházení sdílení přetvořeno na aplikační modul.
• Ukládání a udržování souborů na disku bude nyní samostatný modul. Na tomto modulu zavisí moduly Finance a News.

Location:

trunk/Common

Files:

• File.php (deleted)
• Form/Types/File (deleted)
• Global.php (modified) (8 diffs)
• Update.php (modified) (2 diffs)
• Version.php (modified) (1 diff)

trunk/Common/Global.php ¶

@@ -22 +22 @@
 include_once(dirname(__FILE__).'/Page.php');
 include_once(dirname(__FILE__).'/Form/Form.php');
-include_once(dirname(__FILE__).'/File.php');
 include_once(dirname(__FILE__).'/../aktuality/news.php');
 include_once(dirname(__FILE__).'/../finance/bills.php');
@@ -30 +29 @@
   
 // Application modules
+include_once(dirname(__FILE__).'/../Modules/File/File.php');
 include_once(dirname(__FILE__).'/../Modules/Meteostation/Meteostation.php');
 include_once(dirname(__FILE__).'/../Modules/Portal/Portal.php');
@@ -42 +42 @@
 include_once(dirname(__FILE__).'/../Modules/Finance/Finance.php');
 include_once(dirname(__FILE__).'/../Modules/FinanceBankAPI/FinanceBankAPI.php');
+include_once(dirname(__FILE__).'/../Modules/NetworkShare/NetworkShare.php');
 
 class System extends Module
@@ -52 +53 @@
   var $ModuleManager;
   var $PathItems;
-  var $FilesDir;
 
   function __construct()
@@ -60 +60 @@
     $this->Pages = array();
     $this->ModuleManager = new AppModuleManager();
-    $this->FilesDir = '';
     $this->Database = new Database();
     $this->FormManager = new FormManager($this->Database);
@@ -175 +174 @@
   $System = new System();
   $System->Config = $Config;
-  $System->FilesDir = dirname(__FILE__).'/../'.$Config['Web']['UploadFileFolder'].'/';
   $System->Database->Connect($Config['Database']['Host'], $Config['Database']['User'], $Config['Database']['Password'], $Config['Database']['Database']);
   $System->Database->Prefix = $Config['Database']['Prefix'];
@@ -203 +201 @@
   
   // Register new modules
+  $System->ModuleManager->RegisterModule(new ModuleFile($System));
   $System->ModuleManager->RegisterModule(new ModuleMeteostation($System));
   $System->ModuleManager->RegisterModule(new ModulePortal($System));
@@ -215 +214 @@
   $System->ModuleManager->RegisterModule(new ModuleFinance($System));
   $System->ModuleManager->RegisterModule(new ModuleFinanceBankAPI($System));
+  $System->ModuleManager->RegisterModule(new ModuleNetworkShare($System));
   $System->ModuleManager->StartAll();
 }

trunk/Common/Update.php ¶

@@ -176 +176 @@
         {
           $Output .= '<h3>Aktualizace</h3>';
-          $this->UpdateManager->Update();
+          $Output .= $this->UpdateManager->Update();
           $Output .= $this->ControlPanel();
         } else
@@ -183 +183 @@
           $Output .= '<h3>Instalace</h3>';
           $this->UpdateManager->Install();
-          $this->UpdateManager->Update();
+          $Output .= $this->UpdateManager->Update();
           $Output .= $this->ControlPanel();
         } else

trunk/Common/Version.php ¶

@@ -1 +1 @@
 <?php
 
-$Revision = 503; // Subversion revision
-$DatabaseRevision = 502; 
-$ReleaseTime = '2013-03-10';
+$Revision = 505; // Subversion revision
+$DatabaseRevision = 505; 
+$ReleaseTime = '2013-03-31';
 
 ?>