Changeset 894 for trunk/Modules/NetworkShare

Timestamp:

Jan 5, 2021, 10:30:31 PM (4 years ago)

Author:

chronos

Message:

• Modified: Further improved models initialization system.

Location:

trunk/Modules/NetworkShare

Files:

• NetworkShare.php (modified) (2 diffs)
• update.php (modified) (3 diffs)

trunk/Modules/NetworkShare/NetworkShare.php

@@ -18 +18 @@
   }
 
-  function DoInstall(): void
+  function GetModels(): array
   {
-  }
-
-  function DoUnInstall(): void
-  {
+    return array(NetworkShareItem::GetClassName(), NetworkShareError::GetClassName());
   }
 
@@ -31 +28 @@
   }
 }
+
+class NetworkShareItem extends Model
+{
+  static function GetDesc(): ModelDesc
+  {
+    $Desc = new ModelDesc('NetworkShareItem');
+    $Desc->AddString('Name');
+    $Desc->AddReference('Parent', NetworkShareItem::GetClassName());
+    $Desc->AddReference('Host', NetworkDevice::GetClassName());
+    $Desc->AddBigInt('Size');
+    $Desc->AddString('Ext');
+    $Desc->AddDate('Date');
+    $Desc->AddInteger('Type');
+    return $Desc;
+  }
+}
+
+class NetworkShareError extends Model
+{
+  static function GetDesc(): ModelDesc
+  {
+    $Desc = new ModelDesc(self::GetClassName());
+    $Desc->AddString('Host');
+    $Desc->AddString('Message');
+    return $Desc;
+  }
+}

trunk/Modules/NetworkShare/update.php

@@ -8 +8 @@
   $Hosts = array();
   $StartTime = GetMicrotime();
-  $DbResult = $Database->query("SELECT * FROM NetworkDevice WHERE Online=1 AND (Block=0 OR Name='centrala') AND (Name!='GATE') AND User>0");
+  $DbResult = $Database->query("SELECT * FROM `NetworkDevice` WHERE `Online`=1 AND (`Block`=0 OR `Name`='centrala') AND (`Name` != 'GATE') AND (`User` > 0)");
   while ($Row = $DbResult->fetch_array())
   {
@@ -16 +16 @@
     $HostID = 100;
     $StartTime2 = GetMicrotime();
-    if ($Dnes != $Row['last_share_check'])
+    if ($Dnes != $Row['LastShareCheck'])
     {
       echo("Kontroluji ".$Row['Name']."...\n");
@@ -23 +23 @@
     else echo("Vynechavam ".$Row['Name']."...\n");
     // Aktualizuj datum prochazeni
-    $Database->update('Hosts', "name='".$Row['name']."'",array('last_share_check' => $Dnes));
+    $Database->update('NetworkDevice', "Id='".$Row['Id']."'", array('LastShareCheck' => $Dnes));
   }
-  $Rozdil = GetMicrotime()-$StartTime+10;
+  $Rozdil = GetMicrotime() - $StartTime + 10;
 
   // Oprav a zoptimalizuj tabulku