Changeset 360 for trunk

Timestamp:

Jan 18, 2012, 1:42:13 PM (13 years ago)

Author:

chronos

Message:

• Upraveno: Administrace síťových zařízení přesunuta do systémového modulu Network. Zde doplněny použité modely pro inicializaci databáze.
• Upraveno: Relace ManyToMany má nyní vhodnější parametry pro sestavení pomocné tabulky.

Location:

trunk

Files:

• Common/File.php (moved) (moved from trunk/file.php ) (1 diff)
• Common/Forms.php (moved) (moved from trunk/forms.php )
• Model.php (modified) (1 diff)
• Modules/Module.php (modified) (2 diffs)
• Modules/Network (moved) (moved from trunk/network )
• Modules/Network/Network.php (added)
• Modules/NetworkTopology/topologie-img2.php (deleted)
• Modules/TV/TV.php (modified) (1 diff)
• global.php (modified) (1 diff)

trunk/Common/File.php

@@ -1 +1 @@
 <?php
 
-class File extends OldModule
+class File 
 {
+  var $Database;
+  
   function __construct($Database) 
   {

trunk/Model.php

@@ -82 +82 @@
   }
   
-  function AddPropertyManyToMany($Name, $Column, $TargetModel, $TargetColumn)
+  function AddPropertyManyToMany($TargetModel, $Relation, $ColumOwn, $ColumnTarget)
   {      
-    $this->Properties[] = array('Name' => $Name, 'Type' => PropertyManyToMany, 
-      'TargetModel' => $TargetModel, 'TargetColumn' => $TargetColumn,
-      'Column' => $Column); 
+    $this->Properties[] = array('Type' => PropertyManyToMany, 
+      'TargetModel' => $TargetModel, 'Relation' => $Relation, 'ColumnOwn' => $ColumnOwn,
+      'ColumnTarget' => $ColumnTarget); 
   }
   

trunk/Modules/Module.php

@@ -93 +93 @@
   `Installed` int(11) NOT NULL,
   `Description` text COLLATE utf8_czech_ci NOT NULL,
+  `Dependecies` varchar(255) COLLATE utf8_czech_ci NOT NULL,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_czech_ci AUTO_INCREMENT=1;');
@@ -141 +142 @@
           'Version' => $Module->Version, 'Creator' => $Module->Creator, 
           'Description' => $Module->Description, 'License' => $Module->License,
-          'Installed' => 0));
+          'Installed' => 0, 'Dependecies' => implode(',', $Module->Dependencies)));
         unset($Module);
       } else throw new Exception('Missing class '.$ModuleClassName.' in module '.$ModuleName);

trunk/Modules/TV/TV.php

@@ -111 +111 @@
     $this->AddPropertyInteger('Frequency');
     $this->AddPropertyString('Norm');
-    $this->AddPropertyString('HomePage');    
-    $this->AddPropertyString('Language');    
-    $this->AddPropertyString('ShortName');    
-    $this->AddPropertyString('Stream');    
-    $this->AddPropertyString('StreamWeb');    
-    $this->AddPropertyString('SourceType');    
-    $this->AddPropertyString('Category');    
+    $this->AddPropertyString('HomePage');
+    $this->AddPropertyString('Language');
+    $this->AddPropertyString('ShortName');
+    $this->AddPropertyString('Stream');
+    $this->AddPropertyString('StreamWeb');
+    $this->AddPropertyString('SourceType');
+    $this->AddPropertyString('Category');
   }
 }

trunk/global.php

@@ -9 +9 @@
 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('forms.php');
 include_once('Modules/page.php');
-include_once('file.php');
 include_once('finance/bills.php');
 include_once('finance/finance.php');