Changeset 899 for trunk/Modules/File

Timestamp:

Feb 17, 2021, 12:30:23 PM (4 years ago)

Author:

chronos

Message:

• Modified: AppModule renamed to Module. AppModuleManger renamed to ModuleManager.
• Fixed: Keep Modules Id in ModulesConfig.php in sync with database list of modules.

File:

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

trunk/Modules/File/File.php

@@ -13 +13 @@
   }
 
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc('File');
@@ -116 +116 @@
 class FileDirectory extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc('FileDirectory');
@@ -175 +175 @@
 }
 
-class ModuleFile extends AppModule
+class ModuleFile extends Module
 {
   public File $File;
@@ -187 +187 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'Base module for file management';
-    $this->Dependencies = array('User');
+    $this->Dependencies = array(ModuleUser::GetName());
+    $this->Models = array(FileDirectory::GetClassName(), File::GetClassName());
 
     $this->File = new File($this->System);
-  }
-
-  function GetModels(): array
-  {
-    return array(FileDirectory::GetClassName(), File::GetClassName());
   }
 
@@ -292 +288 @@
   }
 
-  static function Cast(AppModule $AppModule): ModuleFile
-  {
-    if ($AppModule instanceof ModuleFile)
-    {
-      return $AppModule;
-    }
-    throw new Exception('Expected ModuleFile type but got '.gettype($AppModule));
-  }
-}
+  static function Cast(Module $Module): ModuleFile
+  {
+    if ($Module instanceof ModuleFile)
+    {
+      return $Module;
+    }
+    throw new Exception('Expected ModuleFile type but got '.gettype($Module));
+  }
+}