Changeset 899 for trunk/Modules/User

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.

Location:

trunk/Modules/User

Files:

• User.php (modified) (3 diffs)
• UserModel.php (modified) (6 diffs)

trunk/Modules/User/User.php

@@ -5 +5 @@
 include_once(dirname(__FILE__).'/UserPage.php');
 
-class ModuleUser extends AppModule
+class ModuleUser extends Module
 {
   public array $UserPanel;
@@ -18 +18 @@
     $this->License = 'GNU/GPLv3';
     $this->Description = 'User management';
-    $this->Dependencies = array();
+    $this->Models = array(User::GetClassName(), UserOnline::GetClassName(), PermissionGroup::GetClassName(), PermissionOperation::GetClassName(),
+      PermissionGroupAssignment::GetClassName(), PermissionUserAssignment::GetClassName());
+
     $this->UserPanel = array();
     $this->User = new User($System);
-  }
-
-  function GetModels(): array
-  {
-    return array(User::GetClassName(), UserOnline::GetClassName(), PermissionGroup::GetClassName(), PermissionOperation::GetClassName(),
-      PermissionGroupAssignment::GetClassName(), PermissionUserAssignment::GetClassName());
   }
 
@@ -208 +204 @@
   }
 
-  static function Cast(AppModule $AppModule): ModuleUser
-  {
-    if ($AppModule instanceof ModuleUser)
+  static function Cast(Module $Module): ModuleUser
+  {
+    if ($Module instanceof ModuleUser)
     {
-      return $AppModule;
+      return $Module;
     }
-    throw new Exception('Expected ModuleUser type but got '.gettype($AppModule));
+    throw new Exception('Expected ModuleUser type but got '.gettype($Module));
   }
 }

trunk/Modules/User/UserModel.php

@@ -65 +65 @@
   }
 
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -461 +461 @@
 class UserOnline extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -480 +480 @@
 class PermissionGroup extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -490 +490 @@
 class PermissionGroupAssignment extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -502 +502 @@
 class PermissionOperation extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());
@@ -516 +516 @@
 class PermissionUserAssignment extends Model
 {
-  static function GetDesc(): ModelDesc
+  static function GetModelDesc(): ModelDesc
   {
     $Desc = new ModelDesc(self::GetClassName());