Changeset 378 for trunk

Timestamp:

Jan 20, 2012, 3:32:02 PM (13 years ago)

Author:

chronos

Message:

• Přidáno: Model pro NetworkSegment.
• Upraveno: Přepracován model systém pro načítání modelů modulů.

Location:

trunk

Files:

• Common/Model.php (modified) (3 diffs)
• Common/Module.php (modified) (4 diffs)
• Modules/Chat/Chat.php (modified) (1 diff)
• Modules/EmailQueue/EmailQueue.php (modified) (1 diff)
• Modules/Finance/Finance.php (modified) (5 diffs)
• Modules/FrontPage/FrontPage.php (modified) (1 diff)
• Modules/Log/Log.php (modified) (1 diff)
• Modules/Map/Map.php (modified) (1 diff)
• Modules/Meals/Meals.php (modified) (1 diff)
• Modules/Member/Member.php (modified) (1 diff)
• Modules/Network/Network.php (modified) (3 diffs)
• Modules/NetworkLinux/NetworkLinux.php (modified) (1 diff)
• Modules/NetworkRouterOS/NetworkRouterOS.php (modified) (1 diff)
• Modules/NetworkShare/NetworkShare.php (modified) (1 diff)
• Modules/NetworkTopology/NetworkTopology.php (modified) (1 diff)
• Modules/News/News.php (modified) (1 diff)
• Modules/OpeningHours/OpeningHours.php (modified) (1 diff)
• Modules/Project/Project.php (modified) (1 diff)
• Modules/Subject/Subject.php (modified) (1 diff)
• Modules/TV/TV.php (modified) (3 diffs)
• Modules/TimeMeasure/TimeMeasure.php (modified) (1 diff)
• Modules/User/User.php (modified) (1 diff)
• Modules/WebCam/WebCam.php (modified) (1 diff)
• sql/updates/378.sql (added)

trunk/Common/Model.php

@@ -229 +229 @@
       if($Property['Type'] == PropertyOneToMany) 
       {
-        if(!$this->Module->Models[$Property['TargetModel']]->Installed)
-          $this->Module->Models[$Property['TargetModel']]->Install();
+        if(array_key_exists($Property['TargetModel'], $this->Module->Models))
+        {
+          if(!$this->Module->Models[$Property['TargetModel']]->Installed)
+            $this->Module->Models[$Property['TargetModel']]->Install();
+        }
         $this->Database->query('ALTER TABLE `'.$this->Name.'` ADD FOREIGN KEY (`'.$Property['Name'].'`) REFERENCES `'.$Property['TargetModel'].'` (`Id`);');
       }
@@ -238 +241 @@
   function UnInstall()
   {
-    foreach($Model->Properties as $Property)
+    foreach($this->Properties as $Property)
     {
       if($Property['Type'] == PropertyManyToMany)
@@ -244 +247 @@
     }
     $this->Database->query('DROP TABLE IF EXISTS `'.$this->Name.'`');
+    $this->Installed = false;
   }
 }

trunk/Common/Module.php

@@ -12 +12 @@
   var $Dependencies;
   var $Models = array();
+  var $SupportedModels = array();
   var $Database;
   var $Installed;
@@ -33 +34 @@
       $this->System->Modules[$Dependency]->Install();
     $this->LoadModels();
-    foreach($this->Models as $ModelName)
-    {
-      $this->System->Models[$ModelName]->Install();
+    foreach($this->Models as $Index => $Module)
+    {
+      $this->Models[$Index]->Install();
     }
     $this->Database->query('UPDATE SystemModule SET Installed=1 WHERE Name="'.$this->Name.'"');
@@ -43 +44 @@
   {
     DebugLog('Uninstalling module '.$this->Name.'...');
-    foreach($this->Models as $ModelName)
-    {
-      $Model = new $ModelName($this->Database, $this->System);
-      $Model->UnInstall();
-      unset($Model);
+    foreach($this->Models as $Index => $Model)
+    {
+      $this->Models[$Index]->UnInstall();
     }
     $this->Database->query('UPDATE SystemModule SET Installed=0 WHERE Name="'.$this->Name.'"');
+    $this->Installed = false;
   }
   
@@ -62 +62 @@
   function LoadModels()
   {
-    foreach($this->Models as $ModelName)
-    {
-      $this->System->Models[$ModelName] = new $ModelName($this->Database, $this->System);
-      $this->System->Models[$ModelName]->Module = &$this;
+    $this->Models = array();
+    foreach($this->SupportedModels as $ModelName)
+    {
+      $NewModel = new $ModelName($this->Database, $this->System);
+      $NewModel->Module = &$this;
+      $this->Models[$ModelName] = $NewModel;
     }       
   }

trunk/Modules/Chat/Chat.php

@@ -91 +91 @@
     $this->Description = 'Show history of IRC chat and previous SunriseChat';
     $this->Dependencies = array();
-    $this->Models = array();
+    $this->SupportedModels = array();
   }
   

trunk/Modules/EmailQueue/EmailQueue.php

@@ -27 +27 @@
     $this->Description = 'Queue for mass email send, log and review.';
     $this->Dependencies = array('User');
-    $this->Models = array('EmailQueue');
+    $this->SupportedModels = array('EmailQueue');
   }
   

trunk/Modules/Finance/Finance.php

@@ -287 +287 @@
     $this->Description = 'Accounting processing';
     $this->Dependencies = array('User', 'Subject');
-    $this->Models = array('FinanceYear', 'DocumentLine', 'DocumentLineSequence',
+    $this->SupportedModels = array('FinanceYear', 'DocumentLine', 'DocumentLineSequence',
       'FinanceTariff', 'FinanceOperation', 'FinanceClaimsLiabilities',
       'FinanceBills', 'FinanceBillsItems', 'FinanceBillingPeriod', 'FinanceCharge',
@@ -398 +398 @@
     
     $this->SpravaUsers = $this->InternetUsers;
-    $DbResult = $this->Database->query('SELECT SUM(`Consumption`) FROM `network_segments`');
+    $DbResult = $this->Database->query('SELECT SUM(`Consumption`) FROM `NetworkSegments`');
     $TotalConsumption = $DbResult->fetch_array();
     $this->TotalConsumption = $TotalConsumption[0];
@@ -459 +459 @@
       while($ID != 0)
       {
-        $DbResult2 = $this->Database->query('SELECT * FROM `network_segments` WHERE `id`='.$ID);
+        $DbResult2 = $this->Database->query('SELECT * FROM `NetworkSegments` WHERE `Id`='.$ID);
         $Device = $DbResult2->fetch_assoc();
-        $NetworkDevice += $Device['price'] / $Device['users'];
-        $Consumption += $Device['consumption'] / $Device['users_overheads'];
+        $NetworkDevice += $Device['Price'] / $Device['Users'];
+        $Consumption += $Device['Consumption'] / $Device['UsersOverheads'];
         //echo($ID.' '.$InternetSegment.' '.$InternetSegmentId.' '.$Row['inet_hw'].' '.$Price.'<br>');
-        $ID = $Device['parent'];
+        $ID = $Device['Parent'];
       }
     
@@ -497 +497 @@
   {
     $Output = 'Aktualizuji parametry segmentů...<br />';
-    $this->Database->query('UPDATE `network_segments` SET `users` = 0, `users_overheads` = 0');     // Vynulovat počty uživatelů
-    $DbResult = $this->Database->query('SELECT * FROM `network_segments`');
+    $this->Database->query('UPDATE `NetworkSegments` SET `Users` = 0, `UsersOverheads` = 0');     // Vynulovat počty uživatelů
+    $DbResult = $this->Database->query('SELECT * FROM `NetworkSegments`');
     while($NetworkSegment = $DbResult->fetch_array())
     {
       //echo('Segment '.$Row['name'].'<br>');
-      $DbResult2 = $this->Database->query('SELECT `users` FROM `network_segments` WHERE `id`='.$NetworkSegment['id']);
+      $DbResult2 = $this->Database->query('SELECT `Users` FROM `NetworkSegments` WHERE `Id`='.$NetworkSegment['Id']);
       $RowP = $DbResult2->fetch_array();
-      $DbResult2 = $this->Database->query('SELECT `users_overheads` FROM `network_segments` WHERE `id`='.$NetworkSegment['id']);
+      $DbResult2 = $this->Database->query('SELECT `UsersOverheads` FROM `NetworkSegments` WHERE `Id`='.$NetworkSegment['Id']);
       $RowP2 = $DbResult2->fetch_array();
 
-      $DbResult2 = $this->Database->query('SELECT SUM(price) as Price, SUM(consumption) as Consumption FROM network_devices WHERE segment='.$NetworkSegment['id'].' AND used=1');
+      $DbResult2 = $this->Database->query('SELECT SUM(Price) as Price, SUM(Consumption) as Consumption FROM NetworkDevices WHERE Segment='.$NetworkSegment['id'].' AND Used=1');
       $Row2 = $DbResult2->fetch_array();
       $DbResult2 = $this->Database->query('SELECT COUNT(*) FROM Member WHERE NetworkSegment='.$NetworkSegment['id']);
       $Row3 = $DbResult2->fetch_array();
-      $ID = $NetworkSegment['parent'];
+      $ID = $NetworkSegment['Parent'];
       while($ID != 0)
       {
         //echo($ID.', ');
-        $DbResult2 = $this->Database->query('SELECT * FROM network_segments WHERE id='.$ID);
+        $DbResult2 = $this->Database->query('SELECT * FROM NetworkSegments WHERE Id='.$ID);
         $Row4 = $DbResult2->fetch_array();
-        $this->Database->update('network_segments', 'id='.$Row4['id'], array('users' => ($Row4['users'] + $Row3[0]), 'users_overheads' => ($Row4['users_overheads'] + $Row3[0])));
-        $ID = $Row4['parent'];
+        $this->Database->update('NetworkSegments', 'Id='.$Row4['Id'], array('Users' => ($Row4['Users'] + $Row3[0]), 'UsersOverheads' => ($Row4['UsersOverheads'] + $Row3[0])));
+        $ID = $Row4['Parent'];
       }
-      $this->Database->update('network_segments', 'id='.$NetworkSegment['id'], array('price' => $Row2['Price'], 'users' => ($Row3[0] + $RowP['users']), 'consumption' => $Row2['Consumption'], 'users_overheads' => ($Row3[0] + $RowP2['users_overheads'])));
+      $this->Database->update('NetworkSegments', 'Id='.$NetworkSegment['Id'], array('Price' => $Row2['Price'], 'Users' => ($Row3[0] + $RowP['Users']), 'Consumption' => $Row2['Consumption'], 'UsersOverheads' => ($Row3[0] + $RowP2['UsersOverheads'])));
     }
 
@@ -526 +526 @@
     $DbResult = $this->Database->select('Member', 'COUNT(*)');
     $Row = $DbResult->fetch_array();
-    $DbResult = $this->Database->update('network_segments','id='.$this->InternetSegmentId, array('users' => $Row[0], 'users_overheads' => $Row[0]));
+    $DbResult = $this->Database->update('NetworkSegments', 'Id='.$this->InternetSegmentId, array('Users' => $Row[0], 'UsersOverheads' => $Row[0]));
     $this->System->Modules['Log']->NewRecord('Finance', 'RecalculateSegmentParameters');
     return($Output);

trunk/Modules/FrontPage/FrontPage.php

@@ -362 +362 @@
     $this->Description = 'Main page of community network portal';
     $this->Dependencies = array('User', 'News', 'TV', 'Map', 'Chat', 'WebCam');
-    $this->Models = array('Hyperlink', 'HyperlinkGroup', 'Panel', 'PanelColumn');
+    $this->SupportedModels = array('Hyperlink', 'HyperlinkGroup', 'Panel', 'PanelColumn');
   }
   

trunk/Modules/Log/Log.php

@@ -92 +92 @@
     $this->Description = 'Logging of user operations';
     $this->Dependencies = array('User');
-    $this->Models = array('Log');
+    $this->SupportedModels = array('Log');
   }
   

trunk/Modules/Map/Map.php

@@ -148 +148 @@
     $this->Description = 'Show objects on Google maps';
     $this->Dependencies = array('Network');
-    $this->Models = array();
+    $this->SupportedModels = array();
   }
   

trunk/Modules/Meals/Meals.php

@@ -216 +216 @@
     $this->Description = 'Module for management meals. Can print week menu.';
     $this->Dependencies = array('Log');
-    $this->Models = array('Meals', 'MealsInfo');
+    $this->SupportedModels = array('Meals', 'MealsInfo');
   }
   

trunk/Modules/Member/Member.php

@@ -59 +59 @@
     $this->Description = 'Customer and member management';
     $this->Dependencies = array('User', 'Subject');
-    $this->Models = array('Member', 'MemberPayment');
+    $this->SupportedModels = array('Member', 'MemberPayment');
     $this->View = array('MemberOptionsView');
   }

trunk/Modules/Network/Network.php

@@ -78 +78 @@
     $this->AddPropertyString('IPv6');
     $this->AddPropertyString('ExternalIP');
-    $this->AddPropertyOneToMany('Device', 'Device');
+    $this->AddPropertyOneToMany('Device', 'NetworkDevice');
     $this->AddPropertyBoolean('Online');
     $this->AddPropertyDateTime('LastOnline');
@@ -153 +153 @@
   }
 }
+
+class NetworkSegment extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'NetworkSegment';
+    $this->AddPropertyString('Name');
+    $this->AddPropertyInteger('Price');
+    $this->AddPropertyOneToMany('Parent', 'NetworkSegment');
+    $this->AddPropertyInteger('Users');
+    $this->AddPropertyInteger('Consumption');
+    $this->AddPropertyInteger('UsersOverheads');
+  }
+}
+
 
 class EmailView extends ViewForm
@@ -221 +237 @@
     $this->Description = 'Network device, interface and interconnection management';
     $this->Dependencies = array('User', 'Member');
-    $this->Models = array('NetworkDevice', 'NetworkDeviceType', 'NetworkInterface',
-      'NetworkInterfaceType', 'NetworkPoint', 'NetworkLink', 'NetworkSubnet');
+    $this->SupportedModels = array('NetworkDevice', 'NetworkDeviceType', 'NetworkInterface',
+      'NetworkInterfaceType', 'NetworkPoint', 'NetworkLink', 'NetworkSubnet',
+      'NetworkSegment');
   }
   

trunk/Modules/NetworkLinux/NetworkLinux.php

@@ -12 +12 @@
     $this->Description = 'Network service configuration of Linux server';
     $this->Dependencies = array('Network');
-    $this->Models = array();
+    $this->SupportedModels = array();
   }
   

trunk/Modules/NetworkRouterOS/NetworkRouterOS.php

@@ -12 +12 @@
     $this->Description = 'Mikrotik RouterOS configuration';
     $this->Dependencies = array('Network');
-    $this->Models = array();
+    $this->SupportedModels = array();
   }
   

trunk/Modules/NetworkShare/NetworkShare.php

@@ -43 +43 @@
     $this->Description = 'System for loading network computer share file list and allow fast searching.';
     $this->Dependencies = array('Network');
-    $this->Models = array('NetworkShareItem', 'NetworkShareError');
+    $this->SupportedModels = array('NetworkShareItem', 'NetworkShareError');
   }
   

trunk/Modules/NetworkTopology/NetworkTopology.php

@@ -141 +141 @@
     $this->Description = 'Generate image of network device interconnection';
     $this->Dependencies = array('Network');
-    $this->Models = array();
+    $this->SupportedModels = array();
   }
   

trunk/Modules/News/News.php

@@ -101 +101 @@
     $this->Description = 'News and news groups management';
     $this->Dependencies = array('User', 'Log');
-    $this->Models = array('News', 'NewsCategory');
+    $this->SupportedModels = array('News', 'NewsCategory');
     $this->Views = array('News');
   }

trunk/Modules/OpeningHours/OpeningHours.php

@@ -249 +249 @@
     $this->Description = 'Show subject opening hours with time to open or time to close';
     $this->Dependencies = array();
-    $this->Models = array('SubjectOpenTime', 'SubjectOpenTimeDay');
+    $this->SupportedModels = array('SubjectOpenTime', 'SubjectOpenTimeDay');
   }
   

trunk/Modules/Project/Project.php

@@ -35 +35 @@
     $this->Description = 'Project and task management';
     $this->Dependencies = array('User');
-    $this->Models = array('Project', 'ProjectComment');
+    $this->SupportedModels = array('Project', 'ProjectComment');
   }
   

trunk/Modules/Subject/Subject.php

@@ -32 +32 @@
     $this->Description = 'Subject management';
     $this->Dependencies = array();
-    $this->Models = array('Subject');
+    $this->SupportedModels = array('Subject');
   }
   

trunk/Modules/TV/TV.php

@@ -17 +17 @@
   function ShowChannelList()
   {
-    global $Channels;
-
     $Output = 'Stažení přehrávače: <a href="http://www.videolan.org/vlc/">VLC Media Player</a><br/>'.
     'Seznam všech kanálů do přehrávače: <a href="playlist.m3u">Playlist</a><br/>'.
@@ -25 +23 @@
     '<div align="center"><strong>Výpis kanálů:</strong><br>';
 
-    $Where = 
     $DbResult = $this->Database->query('SELECT COUNT(*) FROM `TV` WHERE (`Stream` <> "") OR (`StreamWeb` <> "")');
     $DbRow = $DbResult->fetch_row();
@@ -132 +129 @@
     $this->Description = 'IPTV channel database management';
     $this->Dependencies = array();
-    $this->Models = array('TV');
+    $this->SupportedModels = array('TV');
   }
   

trunk/Modules/TimeMeasure/TimeMeasure.php

@@ -33 +33 @@
     $this->Description = 'Time measure or values';
     $this->Dependencies = array('User');
-    $this->Models = array();
+    $this->SupportedModels = array();
   }
   

trunk/Modules/User/User.php

@@ -372 +372 @@
     $this->Description = 'User management';
     $this->Dependencies = array();
-    $this->Models = array('User', 'UserOnline');
+    $this->SupportedModels = array('User', 'UserOnline');
     $this->Views = array('UserLogin', 'PasswordRecove', 'UserRegister', 'UserOptions',
       'PermissionGroup', 'PermissionOperation', 'PermissionGroupAssignement',

trunk/Modules/WebCam/WebCam.php

@@ -54 +54 @@
     $this->Description = 'Web camera image presentetation';
     $this->Dependencies = array();
-    $this->Models = array();
+    $this->SupportedModels = array();
   }