Changeset 364 for trunk

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:

• Common/Global.php (moved) (moved from trunk/global.php ) (1 diff)
• Common/Model.php (moved) (moved from trunk/Model.php )
• Common/Module.php (moved) (moved from trunk/Modules/Module.php ) (4 diffs)
• Common/Page.php (moved) (moved from trunk/Modules/page.php ) (1 diff)
• Modules/Network/HostList.php (added)
• Modules/Project/Project.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• Modules/User/UserList.php (added)
• finance/bills.php (modified) (1 diff)
• finance/finance.php (modified) (1 diff)
• index.php (modified) (1 diff)
• module.php (deleted)

trunk/Common/Global.php

@@ -1 +1 @@
 <?php
 
-$ConfigFileName = dirname(__FILE__).'/config.php';
+$ConfigFileName = dirname(__FILE__).'/../config.php';
       
 if(file_exists($ConfigFileName)) include_once($ConfigFileName);
   else die('Nenalezen konfigurační soubor '.$ConfigFileName.'!');
   
-include_once('Common/Database.php');
-include_once('Common/Error.php');
-include_once('Common/Code.php');
-include_once('Common/Forms.php');
-include_once('Common/File.php');
-include_once('module.php');
-include_once('Modules/page.php');
+include_once('Database.php');
+include_once('Error.php');
+include_once('Code.php');
+include_once('Forms.php');
+include_once('File.php');
+include_once('Page.php');
+include_once('Module.php');
+include_once('Model.php');
 include_once('finance/bills.php');
 include_once('finance/finance.php');
-include_once('Modules/Module.php');
-include_once('Model.php');
   
 $PrefixMultipliers = array

trunk/Common/Module.php

@@ -1 +1 @@
 <?php
 
-include_once(dirname(__FILE__).'/../Model.php');
+include_once(dirname(__FILE__).'/Model.php');
 
 class Module
@@ -75 +75 @@
     while($Module = $DbResult->fetch_array())
     {
-      include_once(dirname(__FILE__).'/'.$Module['Name'].'/'.$Module['Name'].'.php');
+      include_once('Modules/'.$Module['Name'].'/'.$Module['Name'].'.php');
       $ModuleClassName = 'Module'.$Module['Name'];
       $this->Modules[$Module['Name']] = new $ModuleClassName($this->Database, $this);
@@ -122 +122 @@
     // Load list of modules on disk
     $ModulesOnDisk = array();
-    $Files = scandir(dirname(__FILE__)); 
+    $Files = scandir('Modules'); 
     foreach($Files as $File)
-    if(is_dir(dirname(__FILE__).'/'.$File) and ($File != '.') and ($File != '..') and (substr($File, 0, 1) != '.'))
+    if(is_dir('Modules/'.$File) and ($File != '.') and ($File != '..') and (substr($File, 0, 1) != '.'))
     {
       $ModulesOnDisk[] = $File;
@@ -134 +134 @@
     {
       DebugLog('Adding module '.$ModuleName.' to list');
-      include_once(dirname(__FILE__).'/'.$ModuleName.'/'.$ModuleName.'.php');
+      include_once('Modules/'.$ModuleName.'/'.$ModuleName.'.php');
       $ModuleClassName = 'Module'.$ModuleName;
       if(class_exists($ModuleClassName))

trunk/Common/Page.php

@@ -3 +3 @@
 define('PAGE_NOT_FOUND', 'Stránka nenalezena');
 
-class Page extends OldModule
+class Page 
 {
+  var $Database;
+  var $System;
+  var $Config;
   var $TimeStart;
   var $FormatHTML = false;

trunk/Modules/Project/Project.php

@@ -1 +1 @@
 <?php
-
-include_once(dirname(__FILE__).'/../Module.php');
-include_once(dirname(__FILE__).'/../../Model.php');
 
 class Project extends Model

trunk/Modules/User/User.php

@@ -1 +1 @@
 <?php
 
-include('UserList.php');
+include(dirname(__FILE__).'/UserList.php');
 
 define('LOGIN_USED', 'Přihlašovací jméno již použito.');

trunk/finance/bills.php

@@ -1 +1 @@
 <?php
 
-class Bill extends OldModule
+class Bill 
 {
+  var $Database;
+  var $System;
+  var $Config;
   var $SpecificSymbol = 1; // počítačová sít
   var $FileFolder = 'doklady';

trunk/finance/finance.php

@@ -1 +1 @@
 <?php
 
-class Finance extends OldModule
+class Finance 
 {
+  var $Database;
+  var $Config;
+  var $System;
+  
   var $kWh;
   var $Internet;

trunk/index.php

@@ -1 +1 @@
 <?php
 
-include_once('global.php');
+include_once('Common/Global.php');
 
 function ProcessURL()