Changeset 352 for trunk

Timestamp:

Jan 18, 2012, 8:23:18 AM (13 years ago)

Author:

chronos

Message:

• Upraveno: Doplněny použité modely v modulu FrontPage.
• Upraveno: Optimalizováno načítání skupin odkazů v modulu FrontPage.

File:

• trunk/Modules/FrontPage/FrontPage.php (modified) (5 diffs)

trunk/Modules/FrontPage/FrontPage.php

@@ -7 +7 @@
   var $ShortTitle = '';
   
-  function ShowLinks($GroupId)
-  {
-    global $Database;
-    
-    $DbResult = $Database->query('SELECT * FROM `HyperlinkGroup` WHERE `Id`='.$GroupId);
-    $HyperlinkGroup = $DbResult->fetch_assoc();
-
+  function ShowLinks($HyperlinkGroup)
+  {
     $Output = '';
-    $DbResult = $Database->query('SELECT * FROM `Hyperlink` WHERE (`Group`='.$GroupId.') AND (`Enable` = 1)');
+    $DbResult = $this->Database->query('SELECT * FROM `Hyperlink` WHERE (`Group`='.$HyperlinkGroup['Id'].') AND (`Enable` = 1)');
     while($HyperLink = $DbResult->fetch_assoc())
     {
@@ -270 +265 @@
 
     $Database->select_db($Config['Database']['Database']);
-
+      
+    $DbResult = $Database->query('SELECT * FROM `HyperlinkGroup`');
+    while($DbRow = $DbResult->fetch_assoc())
+      $HyperlinkGroups[$DbRow['Id']] = $DbRow;
+
+    
     // Show pannels
     //if(IsInternetAddr()) echo('Internet'); else echo('LAN');
     //$Output .= $this->InfoBar();
     $Output .= '<table id="MainTable"><tr>';
-    $DbResult = $Database->select('PanelColumn', '*');
+    $DbResult = $this->Database->select('PanelColumn', '*');
     while($PanelColumn =  $DbResult->fetch_assoc())
     {
@@ -284 +284 @@
       while($Panel = $DbResult2->fetch_assoc())
       {
-        if($Panel['Module'] == 'HyperlinkGroup') $Output .= $this->ShowLinks($Panel['Parameters']);
+        if($Panel['Module'] == 'HyperlinkGroup') $Output .= $this->ShowLinks($HyperlinkGroups[$Panel['Parameters']]);
         else if($Panel['Module'] == 'OnlineHostList') $Output .= $this->Panel('Online počítače', $this->OnlineHostList());
         else if($Panel['Module'] == 'UserOptions') 
@@ -302 +302 @@
 }
 
+class Hyperlink extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'Hyperlink';
+    $this->AddPropertyString('Name');
+    $this->AddPropertyString('URL');
+    $this->AddPropertyOneToMany('Group', 'HyperlinkGroup');
+    $this->AddPropertyString('IconFile');
+    $this->AddPropertyString('PermissionModule');
+    $this->AddPropertyString('PermissionOperation');
+    $this->AddPropertyBoolean('Enable');
+  }
+}
+
+class HyperlinkGroup extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'HyperlinkGroup';
+    $this->AddPropertyString('Name');
+  }
+}
+
+class Panel extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'Panel';
+    $this->AddPropertyString('Module');
+    $this->AddPropertyString('Parameters');
+    $this->AddPropertyInteger('Order');
+    $this->AddPropertyOneToMany('PanelColumn', 'PanelColumn');
+  }
+}
+
+class PanelColumn extends Model
+{
+  function __construct($Database, $System)
+  {
+    parent::__construct($Database, $System);
+    $this->Name = 'PanelColumn';
+    $this->AddPropertyString('Width');
+  }
+}
+
 class ModuleFrontPage extends Module
 {
@@ -313 +362 @@
     $this->Description = 'Main page of community network portal';
     $this->Dependencies = array('User', 'News', 'TV', 'Map', 'Chat', 'WebCam');
-    $this->Models = array();
+    $this->Models = array('Hyperlink', 'HyperlinkGroup', 'Panel', 'PanelColumn');
   }