Changeset 899 for trunk/Modules
- Timestamp:
- Feb 17, 2021, 12:30:23 PM (4 years ago)
- Location:
- trunk/Modules
- Files:
-
- 50 edited
-
API/API.php (modified) (3 diffs)
-
Chat/Chat.php (modified) (4 diffs)
-
Config/Config.php (modified) (1 diff)
-
Customer/Customer.php (modified) (10 diffs)
-
Document/Document.php (modified) (6 diffs)
-
EmailQueue/EmailQueue.php (modified) (4 diffs)
-
Employee/Employee.php (modified) (4 diffs)
-
Error/Error.php (modified) (2 diffs)
-
File/File.php (modified) (5 diffs)
-
Finance/Finance.php (modified) (4 diffs)
-
Finance/FinanceModels.php (modified) (18 diffs)
-
FinanceBankAPI/FileImport.php (modified) (1 diff)
-
FinanceBankAPI/FinanceBankAPI.php (modified) (3 diffs)
-
IS/IS.php (modified) (6 diffs)
-
Log/Log.php (modified) (4 diffs)
-
Map/Map.php (modified) (3 diffs)
-
Meals/Meals.php (modified) (4 diffs)
-
Meteostation/Meteostation.php (modified) (2 diffs)
-
Monitoring/Monitoring.php (modified) (2 diffs)
-
Network/Network.php (modified) (3 diffs)
-
Network/NetworkModels.php (modified) (23 diffs)
-
NetworkConfig/NetworkConfig.php (modified) (5 diffs)
-
NetworkConfigAirOS/NetworkConfigAirOS.php (modified) (2 diffs)
-
NetworkConfigLinux/NetworkConfigLinux.php (modified) (2 diffs)
-
NetworkConfigRouterOS/Generators/Queue.php (modified) (1 diff)
-
NetworkConfigRouterOS/NetworkConfigRouterOS.php (modified) (2 diffs)
-
NetworkShare/NetworkShare.php (modified) (4 diffs)
-
NetworkShare/browse.php (modified) (1 diff)
-
NetworkTopology/NetworkTopology.php (modified) (3 diffs)
-
News/News.php (modified) (5 diffs)
-
Notify/Notify.php (modified) (6 diffs)
-
OpeningHours/OpeningHours.php (modified) (4 diffs)
-
Portal/Portal.php (modified) (4 diffs)
-
RSS/RSS.php (modified) (4 diffs)
-
Scheduler/Scheduler.php (modified) (5 diffs)
-
Search/Search.php (modified) (3 diffs)
-
SpeedTest/SpeedTest.php (modified) (2 diffs)
-
Stock/Stock.php (modified) (10 diffs)
-
Subject/Subject.php (modified) (6 diffs)
-
System/System.php (modified) (3 diffs)
-
System/SystemModels.php (modified) (7 diffs)
-
TV/TV.php (modified) (4 diffs)
-
Task/Task.php (modified) (5 diffs)
-
TimeMeasure/Measure.php (modified) (2 diffs)
-
TimeMeasure/TimeMeasure.php (modified) (2 diffs)
-
User/User.php (modified) (3 diffs)
-
User/UserModel.php (modified) (6 diffs)
-
VPS/VPS.php (modified) (2 diffs)
-
WebCam/WebCam.php (modified) (3 diffs)
-
Wiki/Wiki.php (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Modules/API/API.php
r894 r899 15 15 */ 16 16 17 class ModuleAPI extends AppModule17 class ModuleAPI extends Module 18 18 { 19 19 function __construct(System $System) … … 23 23 $this->Version = '1.0'; 24 24 $this->Creator = 'Chronos'; 25 $this->License = 'GNU/GPL ';25 $this->License = 'GNU/GPLv3'; 26 26 $this->Description = 'Remote API for support of other clients'; 27 $this->Dependencies = array('User'); 27 $this->Dependencies = array(ModuleUser::GetName()); 28 $this->Models = array(APIToken::GetClassName()); 28 29 } 29 30 … … 32 33 $this->System->RegisterPage(['api'], 'PageAPI'); 33 34 } 34 35 function GetModels(): array36 {37 return array(APIToken::GetClassName());38 }39 35 } 40 36 41 37 class ApiToken extends Model 42 38 { 43 static function Get Desc(): ModelDesc39 static function GetModelDesc(): ModelDesc 44 40 { 45 41 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Chat/Chat.php
r894 r899 85 85 } 86 86 87 class ModuleChat extends AppModule87 class ModuleChat extends Module 88 88 { 89 89 function __construct(System $System) … … 93 93 $this->Version = '1.0'; 94 94 $this->Creator = 'Chronos'; 95 $this->License = 'GNU/GPL ';95 $this->License = 'GNU/GPLv3'; 96 96 $this->Description = 'Show history of IRC chat and previous SunriseChat'; 97 $this->Dependencies = array(); 98 } 99 100 function GetModels(): array 101 { 102 return array(ChatHistory::GetClassName()); 97 $this->Models = array(ChatHistory::GetClassName()); 103 98 } 104 99 … … 111 106 class ChatHistory extends Model 112 107 { 113 static function Get Desc(): ModelDesc108 static function GetModelDesc(): ModelDesc 114 109 { 115 110 $Desc = new ModelDesc(self::GetClassName()); … … 121 116 $Desc->AddInteger('RoomType'); 122 117 $Desc->AddString('Host'); 123 118 return $Desc; 124 119 } 125 120 } -
trunk/Modules/Config/Config.php
r897 r899 1 1 <?php 2 2 3 class ModuleConfig extends AppModule3 class ModuleConfig extends Module 4 4 { 5 5 function __construct(System $System) 6 6 { 7 7 parent::__construct($System); 8 $this->Name = ' Config';8 $this->Name = 'Desc'; 9 9 $this->Version = '1.0'; 10 10 $this->Creator = 'Chronos'; 11 11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Configuration support for other modules'; 13 $this->Dependencies = array('System'); 14 $this->Revision = 1; 13 $this->Dependencies = array(ModuleSystem::GetName()); 15 14 $this->Type = ModuleType::System; 16 15 } 17 18 function GetModels(): array19 {20 return array();21 }22 23 function DoStart(): void24 {25 }26 16 } -
trunk/Modules/Customer/Customer.php
r896 r899 1 1 <?php 2 2 3 class ModuleCustomer extends AppModule3 class ModuleCustomer extends Module 4 4 { 5 5 function __construct(System $System) … … 9 9 $this->Version = '1.0'; 10 10 $this->Creator = 'Chronos'; 11 $this->License = 'GNU/GPL ';11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Customer management'; 13 $this->Dependencies = array('User', 'Finance'); 13 $this->Dependencies = array(ModuleUser::GetName(), ModuleFinance::GetName()); 14 $this->Models = array(Member::GetClassName(), MemberPayment::GetClassName(), SupportActivity::GetClassName(), ServiceCategory::GetClassName(), 15 Service::GetClassName(), ServiceCustomerRel::GetClassName(), UserCustomerRel::GetClassName()); 14 16 } 15 17 … … 199 201 } 200 202 201 function GetModels(): array202 {203 return array(Member::GetClassName(), MemberPayment::GetClassName(), SupportActivity::GetClassName(), ServiceCategory::GetClassName(),204 Service::GetClassName(), ServiceCustomerRel::GetClassName(), UserCustomerRel::GetClassName());205 }206 207 203 function ShowDashboardItem(): string 208 204 { … … 221 217 class Member extends Model 222 218 { 223 static function Get Desc(): ModelDesc219 static function GetModelDesc(): ModelDesc 224 220 { 225 221 $Desc = new ModelDesc(self::GetClassName()); … … 242 238 class MemberPayment extends Model 243 239 { 244 static function Get Desc(): ModelDesc240 static function GetModelDesc(): ModelDesc 245 241 { 246 242 $Desc = new ModelDesc(self::GetClassName()); … … 257 253 class Service extends Model 258 254 { 259 static function Get Desc(): ModelDesc255 static function GetModelDesc(): ModelDesc 260 256 { 261 257 $Desc = new ModelDesc(self::GetClassName()); … … 279 275 class ServiceCategory extends Model 280 276 { 281 static function Get Desc(): ModelDesc277 static function GetModelDesc(): ModelDesc 282 278 { 283 279 $Desc = new ModelDesc(self::GetClassName()); … … 289 285 class SupportActivity extends Model 290 286 { 291 static function Get Desc(): ModelDesc287 static function GetModelDesc(): ModelDesc 292 288 { 293 289 $Desc = new ModelDesc(self::GetClassName()); … … 302 298 class ServiceCustomerRel extends Model 303 299 { 304 static function Get Desc(): ModelDesc300 static function GetModelDesc(): ModelDesc 305 301 { 306 302 $Desc = new ModelDesc(self::GetClassName()); … … 315 311 class UserCustomerRel extends Model 316 312 { 317 static function Get Desc(): ModelDesc313 static function GetModelDesc(): ModelDesc 318 314 { 319 315 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Document/Document.php
r894 r899 1 1 <?php 2 2 3 class ModuleDocument extends AppModule3 class ModuleDocument extends Module 4 4 { 5 5 function __construct(System $System) … … 9 9 $this->Version = '1.0'; 10 10 $this->Creator = 'Chronos'; 11 $this->License = 'GNU/GPL ';11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Documents support'; 13 $this->Dependencies = array(); 13 $this->Models = array(FinanceYear::GetClassName(), DocumentLineCode::GetClassName(), DocumentLine::GetClassName(), 14 DocumentLineSequence::GetClassName()); 14 15 } 15 16 … … 79 80 )); 80 81 } 81 82 function GetModels(): array83 {84 return array(FinanceYear::GetClassName(), DocumentLineCode::GetClassName(), DocumentLine::GetClassName(),85 DocumentLineSequence::GetClassName());86 }87 82 } 88 83 89 84 class DocumentLine extends Model 90 85 { 91 static function Get Desc(): ModelDesc86 static function GetModelDesc(): ModelDesc 92 87 { 93 88 $Desc = new ModelDesc(self::GetClassName()); … … 101 96 class DocumentLineCode extends Model 102 97 { 103 static function Get Desc(): ModelDesc98 static function GetModelDesc(): ModelDesc 104 99 { 105 100 $Desc = new ModelDesc(self::GetClassName()); … … 112 107 class DocumentLineSequence extends Model 113 108 { 114 static function Get Desc(): ModelDesc109 static function GetModelDesc(): ModelDesc 115 110 { 116 111 $Desc = new ModelDesc(self::GetClassName()); … … 125 120 class FinanceYear extends Model 126 121 { 127 static function Get Desc(): ModelDesc122 static function GetModelDesc(): ModelDesc 128 123 { 129 124 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/EmailQueue/EmailQueue.php
r894 r899 21 21 class EmailQueue extends Model 22 22 { 23 static function Get Desc(): ModelDesc23 static function GetModelDesc(): ModelDesc 24 24 { 25 25 $Desc = new ModelDesc(self::GetClassName()); … … 36 36 } 37 37 38 class ModuleEmailQueue extends AppModule38 class ModuleEmailQueue extends Module 39 39 { 40 40 function __construct(System $System) … … 46 46 $this->License = 'GNU/GPLv3'; 47 47 $this->Description = 'Queue for delayed email sending and history'; 48 $this->Dependencies = array('Log'); 49 } 50 51 function GetModels(): array 52 { 53 return array(EmailQueue::GetClassName()); 48 $this->Dependencies = array(ModuleLog::GetName()); 49 $this->Models = array(EmailQueue::GetClassName()); 54 50 } 55 51 … … 123 119 } 124 120 125 static function Cast( AppModule $AppModule): ModuleEmailQueue121 static function Cast(Module $Module): ModuleEmailQueue 126 122 { 127 if ($ AppModule instanceof ModuleEmailQueue)123 if ($Module instanceof ModuleEmailQueue) 128 124 { 129 return $ AppModule;125 return $Module; 130 126 } 131 throw new Exception('Expected ModuleEmailQueue type but '.gettype($ AppModule));127 throw new Exception('Expected ModuleEmailQueue type but '.gettype($Module)); 132 128 } 133 129 } -
trunk/Modules/Employee/Employee.php
r894 r899 3 3 class Employee extends Model 4 4 { 5 static function Get Desc(): ModelDesc5 static function GetModelDesc(): ModelDesc 6 6 { 7 7 $Desc = new ModelDesc(self::GetClassName()); … … 20 20 class EmployeeSalary extends Model 21 21 { 22 static function Get Desc(): ModelDesc22 static function GetModelDesc(): ModelDesc 23 23 { 24 24 $Desc = new ModelDesc(self::GetClassName()); … … 31 31 } 32 32 33 class ModuleEmployee extends AppModule33 class ModuleEmployee extends Module 34 34 { 35 35 function __construct(System $System) … … 39 39 $this->Version = '1.0'; 40 40 $this->Creator = 'Chronos'; 41 $this->License = 'GNU/GPL ';41 $this->License = 'GNU/GPLv3'; 42 42 $this->Description = 'Employee wages management'; 43 $this->Dependencies = array('User', 'Finance'); 44 } 45 46 function GetModels(): array 47 { 48 return array(Employee::GetClassName(), EmployeeSalary::GetClassName()); 43 $this->Dependencies = array(ModuleUser::GetName(), ModuleFinance::GetName()); 44 $this->Models = array(Employee::GetClassName(), EmployeeSalary::GetClassName()); 49 45 } 50 46 -
trunk/Modules/Error/Error.php
r893 r899 1 1 <?php 2 2 3 class ModuleError extends AppModule3 class ModuleError extends Module 4 4 { 5 5 public string $Encoding; … … 14 14 $this->License = 'GNU/GPLv3'; 15 15 $this->Description = 'Error logging and reporting'; 16 $this->Dependencies = array( 'Log');16 $this->Dependencies = array(ModuleLog::GetName()); 17 17 18 18 $this->ErrorHandler = new ErrorHandler(); -
trunk/Modules/File/File.php
r894 r899 13 13 } 14 14 15 static function Get Desc(): ModelDesc15 static function GetModelDesc(): ModelDesc 16 16 { 17 17 $Desc = new ModelDesc('File'); … … 116 116 class FileDirectory extends Model 117 117 { 118 static function Get Desc(): ModelDesc118 static function GetModelDesc(): ModelDesc 119 119 { 120 120 $Desc = new ModelDesc('FileDirectory'); … … 175 175 } 176 176 177 class ModuleFile extends AppModule177 class ModuleFile extends Module 178 178 { 179 179 public File $File; … … 187 187 $this->License = 'GNU/GPLv3'; 188 188 $this->Description = 'Base module for file management'; 189 $this->Dependencies = array('User'); 189 $this->Dependencies = array(ModuleUser::GetName()); 190 $this->Models = array(FileDirectory::GetClassName(), File::GetClassName()); 190 191 191 192 $this->File = new File($this->System); 192 }193 194 function GetModels(): array195 {196 return array(FileDirectory::GetClassName(), File::GetClassName());197 193 } 198 194 … … 292 288 } 293 289 294 static function Cast( AppModule $AppModule): ModuleFile295 { 296 if ($ AppModule instanceof ModuleFile)297 { 298 return $ AppModule;299 } 300 throw new Exception('Expected ModuleFile type but got '.gettype($ AppModule));301 } 302 } 290 static function Cast(Module $Module): ModuleFile 291 { 292 if ($Module instanceof ModuleFile) 293 { 294 return $Module; 295 } 296 throw new Exception('Expected ModuleFile type but got '.gettype($Module)); 297 } 298 } -
trunk/Modules/Finance/Finance.php
r894 r899 8 8 include_once(dirname(__FILE__).'/Trade.php'); 9 9 10 class ModuleFinance extends AppModule10 class ModuleFinance extends Module 11 11 { 12 12 public Finance $Finance; … … 21 21 $this->License = 'GNU/GPLv3'; 22 22 $this->Description = 'Base module for finance management'; 23 $this->Dependencies = array('File', 'EmailQueue', 'Subject', 'Document'); 24 25 $this->Bill = new Bill($this->System); 26 $this->Finance = new Finance($this->System); 27 } 28 29 function GetModels(): array 30 { 31 return array(FinanceBillingPeriod::GetClassName(), FinanceVatType::GetClassName(), FinanceVat::GetClassName(), 23 $this->Dependencies = array(ModuleFile::GetName(), ModuleEmailQueue::GetName(), ModuleSubject::GetName(), ModuleDocument::GetName()); 24 $this->Models = array(FinanceBillingPeriod::GetClassName(), FinanceVatType::GetClassName(), FinanceVat::GetClassName(), 32 25 FinanceGroup::GetClassName(), FinanceOperationGroup::GetClassName(), FinanceOperation::GetClassName(), 33 26 FinanceInvoiceGroup::GetClassName(), FinanceInvoice::GetClassName(), FinanceInvoiceItem::GetClassName(), … … 35 28 Currency::GetClassName(), FinanceBank::GetClassName(), FinanceBankAccount::GetClassName(), FinanceCharge::GetClassName(), 36 29 Contract::GetClassName(), FinanceInvoiceOperationRel::GetClassName()); 30 31 $this->Bill = new Bill($this->System); 32 $this->Finance = new Finance($this->System); 37 33 } 38 34 … … 632 628 } 633 629 634 static function Cast( AppModule $AppModule): ModuleFinance635 { 636 if ($ AppModule instanceof ModuleFinance)630 static function Cast(Module $Module): ModuleFinance 631 { 632 if ($Module instanceof ModuleFinance) 637 633 { 638 return $ AppModule;634 return $Module; 639 635 } 640 throw new Exception('Expected ModuleFinance type but '.gettype($ AppModule));636 throw new Exception('Expected ModuleFinance type but '.gettype($Module)); 641 637 } 642 638 } -
trunk/Modules/Finance/FinanceModels.php
r894 r899 217 217 class FinanceGroup extends Model 218 218 { 219 static function Get Desc(): ModelDesc219 static function GetModelDesc(): ModelDesc 220 220 { 221 221 $Desc = new ModelDesc(self::GetClassName()); … … 227 227 class FinanceOperation extends Model 228 228 { 229 static function Get Desc(): ModelDesc229 static function GetModelDesc(): ModelDesc 230 230 { 231 231 $Desc = new ModelDesc(self::GetClassName()); … … 250 250 class FinanceOperationGroup extends Model 251 251 { 252 static function Get Desc(): ModelDesc252 static function GetModelDesc(): ModelDesc 253 253 { 254 254 $Desc = new ModelDesc(self::GetClassName()); … … 263 263 class FinanceInvoice extends Model 264 264 { 265 static function Get Desc(): ModelDesc265 static function GetModelDesc(): ModelDesc 266 266 { 267 267 $Desc = new ModelDesc(self::GetClassName()); … … 285 285 class FinanceInvoiceGroup extends Model 286 286 { 287 static function Get Desc(): ModelDesc287 static function GetModelDesc(): ModelDesc 288 288 { 289 289 $Desc = new ModelDesc(self::GetClassName()); … … 298 298 class Company extends Model 299 299 { 300 static function Get Desc(): ModelDesc300 static function GetModelDesc(): ModelDesc 301 301 { 302 302 $Desc = new ModelDesc(self::GetClassName()); … … 309 309 class FinanceInvoiceItem extends Model 310 310 { 311 static function Get Desc(): ModelDesc311 static function GetModelDesc(): ModelDesc 312 312 { 313 313 $Desc = new ModelDesc(self::GetClassName()); … … 323 323 class FinanceTreasury extends Model 324 324 { 325 static function Get Desc(): ModelDesc325 static function GetModelDesc(): ModelDesc 326 326 { 327 327 $Desc = new ModelDesc(self::GetClassName()); … … 334 334 class FinanceTreasuryCheck extends Model 335 335 { 336 static function Get Desc(): ModelDesc336 static function GetModelDesc(): ModelDesc 337 337 { 338 338 $Desc = new ModelDesc(self::GetClassName()); … … 357 357 class FinanceBankAccount extends Model 358 358 { 359 static function Get Desc(): ModelDesc359 static function GetModelDesc(): ModelDesc 360 360 { 361 361 $Desc = new ModelDesc(self::GetClassName()); … … 379 379 class FinanceBank extends Model 380 380 { 381 static function Get Desc(): ModelDesc381 static function GetModelDesc(): ModelDesc 382 382 { 383 383 $Desc = new ModelDesc(self::GetClassName()); … … 392 392 class Currency extends Model 393 393 { 394 static function Get Desc(): ModelDesc394 static function GetModelDesc(): ModelDesc 395 395 { 396 396 $Desc = new ModelDesc(self::GetClassName()); … … 404 404 class FinanceCharge extends Model 405 405 { 406 static function Get Desc(): ModelDesc406 static function GetModelDesc(): ModelDesc 407 407 { 408 408 $Desc = new ModelDesc(self::GetClassName()); … … 422 422 class FinanceVat extends Model 423 423 { 424 static function Get Desc(): ModelDesc424 static function GetModelDesc(): ModelDesc 425 425 { 426 426 $Desc = new ModelDesc(self::GetClassName()); … … 435 435 class FinanceVatType extends Model 436 436 { 437 static function Get Desc(): ModelDesc437 static function GetModelDesc(): ModelDesc 438 438 { 439 439 $Desc = new ModelDesc(self::GetClassName()); … … 445 445 class Contract extends Model 446 446 { 447 static function Get Desc(): ModelDesc447 static function GetModelDesc(): ModelDesc 448 448 { 449 449 $Desc = new ModelDesc(self::GetClassName()); … … 460 460 class FinanceBillingPeriod extends Model 461 461 { 462 static function Get Desc(): ModelDesc462 static function GetModelDesc(): ModelDesc 463 463 { 464 464 $Desc = new ModelDesc(self::GetClassName()); … … 471 471 class FinanceInvoiceOperationRel extends Model 472 472 { 473 static function Get Desc(): ModelDesc473 static function GetModelDesc(): ModelDesc 474 474 { 475 475 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/FinanceBankAPI/FileImport.php
r887 r899 180 180 function Insert(): string 181 181 { 182 $Finance = $ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance;182 $Finance = ModuleFinance::Cast($this->System->GetModule('Finance'))->Finance; 183 183 $Output = ''; 184 184 -
trunk/Modules/FinanceBankAPI/FinanceBankAPI.php
r894 r899 8 8 class FinanceBankImport extends Model 9 9 { 10 static function Get Desc(): ModelDesc10 static function GetModelDesc(): ModelDesc 11 11 { 12 12 $Desc = new ModelDesc(self::GetClassName()); … … 27 27 } 28 28 29 class ModuleFinanceBankAPI extends AppModule29 class ModuleFinanceBankAPI extends Module 30 30 { 31 31 function __construct(System $System) … … 37 37 $this->License = 'GNU/GPLv3'; 38 38 $this->Description = 'Communication through API to various banks, manual file import'; 39 $this->Dependencies = array('Finance', 'Scheduler', 'IS'); 40 } 41 42 function GetModels(): array 43 { 44 return array(FinanceBankImport::GetClassName()); 39 $this->Dependencies = array(ModuleFinance::GetName(), ModuleScheduler::GetName(), ModuleIS::GetName()); 40 $this->Models = array(FinanceBankImport::GetClassName()); 45 41 } 46 42 -
trunk/Modules/IS/IS.php
r894 r899 845 845 class Menu extends Model 846 846 { 847 static function Get Desc(): ModelDesc847 static function GetModelDesc(): ModelDesc 848 848 { 849 849 $Desc = new ModelDesc(self::GetClassName()); … … 855 855 class MenuItem extends Model 856 856 { 857 static function Get Desc(): ModelDesc857 static function GetModelDesc(): ModelDesc 858 858 { 859 859 $Desc = new ModelDesc(self::GetClassName()); … … 868 868 class MenuItemFavorite extends Model 869 869 { 870 static function Get Desc(): ModelDesc870 static function GetModelDesc(): ModelDesc 871 871 { 872 872 $Desc = new ModelDesc(self::GetClassName()); … … 877 877 } 878 878 879 class ModuleIS extends AppModule879 class ModuleIS extends Module 880 880 { 881 881 public array $DashboardItems; … … 890 890 $this->License = 'GNU/GPLv3'; 891 891 $this->Description = 'User interface for generic information system'; 892 $this->Dependencies = array('User'); 892 $this->Dependencies = array(ModuleUser::GetName()); 893 $this->Models = array(Menu::GetClassName(), MenuItem::GetClassName(), MenuItemFavorite::GetClassName()); 893 894 894 895 $this->DashboardItems = array(); 895 }896 897 function GetModels(): array898 {899 return array(Menu::GetClassName(), MenuItem::GetClassName(), MenuItemFavorite::GetClassName());900 896 } 901 897 … … 956 952 } 957 953 958 static function Cast( AppModule $AppModule): ModuleIS959 { 960 if ($ AppModule instanceof ModuleIS)961 { 962 return $ AppModule;963 } 964 throw new Exception('Expected ModuleIS type but '.gettype($ AppModule));954 static function Cast(Module $Module): ModuleIS 955 { 956 if ($Module instanceof ModuleIS) 957 { 958 return $Module; 959 } 960 throw new Exception('Expected ModuleIS type but '.gettype($Module)); 965 961 } 966 962 } -
trunk/Modules/Log/Log.php
r894 r899 1 1 <?php 2 2 3 class ModuleLog extends AppModule3 class ModuleLog extends Module 4 4 { 5 5 function __construct(System $System) … … 11 11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Logging user actions'; 13 $this->Dependencies = array('User', 'RSS'); 14 } 15 16 function GetModels(): array 17 { 18 return array('Log'); 13 $this->Dependencies = array(ModuleUser::GetName(), ModuleRSS::GetName()); 14 $this->Models = array(Log::GetClassName()); 19 15 } 20 16 … … 91 87 } 92 88 93 static function Cast( AppModule $AppModule): ModuleLog89 static function Cast(Module $Module): ModuleLog 94 90 { 95 if ($ AppModule instanceof ModuleLog)91 if ($Module instanceof ModuleLog) 96 92 { 97 return $ AppModule;93 return $Module; 98 94 } 99 throw new Exception('Expected ModuleLog type but got '.gettype($ AppModule));95 throw new Exception('Expected ModuleLog type but got '.gettype($Module)); 100 96 } 101 97 } … … 103 99 class Log extends Model 104 100 { 105 static function Get Desc(): ModelDesc101 static function GetModelDesc(): ModelDesc 106 102 { 107 103 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Map/Map.php
r894 r899 257 257 } 258 258 259 class ModuleMap extends AppModule259 class ModuleMap extends Module 260 260 { 261 261 function __construct(System $System) … … 265 265 $this->Version = '1.0'; 266 266 $this->Creator = 'Chronos'; 267 $this->License = 'GNU/GPL ';267 $this->License = 'GNU/GPLv3'; 268 268 $this->Description = 'Show objects on Google maps'; 269 $this->Dependencies = array( 'Network', 'User');270 $this-> SupportedModels = array();269 $this->Dependencies = array(ModuleNetwork::GetName(), ModuleUser::GetName()); 270 $this->Models = array(MapPosition::GetClassName()); 271 271 } 272 272 … … 313 313 )); 314 314 } 315 316 function GetModels(): array317 {318 return array(MapPosition::GetClassName());319 }320 315 } 321 316 322 317 class MapPosition extends Model 323 318 { 324 static function Get Desc(): ModelDesc319 static function GetModelDesc(): ModelDesc 325 320 { 326 321 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Meals/Meals.php
r894 r899 182 182 } 183 183 184 class ModuleMeals extends AppModule184 class ModuleMeals extends Module 185 185 { 186 186 function __construct(System $System) … … 190 190 $this->Version = '1.0'; 191 191 $this->Creator = 'Chronos'; 192 $this->License = 'GNU/GPL ';192 $this->License = 'GNU/GPLv3'; 193 193 $this->Description = 'Module for management meals. Can print week menu.'; 194 $this->Dependencies = array('Log'); 195 $this->SupportedModels = array('Meals', 'MealsInfo'); 196 } 197 198 function GetModels(): array 199 { 200 return array(Meals::GetClassName(), MealsInfo::GetClassName()); 194 $this->Dependencies = array(ModuleLog::GetName()); 195 $this->Models = array(Meals::GetClassName(), MealsInfo::GetClassName()); 201 196 } 202 197 … … 209 204 class Meals extends Model 210 205 { 211 static function Get Desc(): ModelDesc206 static function GetModelDesc(): ModelDesc 212 207 { 213 208 $Desc = new ModelDesc(self::GetClassName()); … … 222 217 class MealsInfo extends Model 223 218 { 224 static function Get Desc(): ModelDesc219 static function GetModelDesc(): ModelDesc 225 220 { 226 221 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Meteostation/Meteostation.php
r894 r899 77 77 } 78 78 79 class ModuleMeteoStation extends AppModule79 class ModuleMeteoStation extends Module 80 80 { 81 81 function __construct(System $System) … … 87 87 $this->License = 'GNU/GPLv3'; 88 88 $this->Description = 'Gathering and presentation of data from network meteostation.'; 89 $this->Dependencies = array();90 89 } 91 90 -
trunk/Modules/Monitoring/Monitoring.php
r895 r899 1 1 <?php 2 2 3 class ModuleMonitoring extends AppModule3 class ModuleMonitoring extends Module 4 4 { 5 5 function __construct(System $System) … … 11 11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Monitoring for various states'; 13 $this->Dependencies = array();14 13 } 15 14 -
trunk/Modules/Network/Network.php
r895 r899 100 100 } 101 101 102 class ModuleNetwork extends AppModule102 class ModuleNetwork extends Module 103 103 { 104 104 public int $MinNotifyTime; … … 112 112 $this->License = 'GNU/GPLv3'; 113 113 $this->Description = 'Networking related tools'; 114 $this->Dependencies = array('Notify', 'IS'); 115 116 // TODO: Make notify time configurable 117 $this->MinNotifyTime = 30; // seconds 118 } 119 120 function GetModels(): array 121 { 122 return array(NetworkDomainAlias::GetClassName(), NetworkDevice::GetClassName(), NetworkDeviceType::GetClassName(), 114 $this->Dependencies = array(ModuleNotify::GetName(), ModuleIS::GetName()); 115 $this->Models = array(NetworkDomainAlias::GetClassName(), NetworkDevice::GetClassName(), NetworkDeviceType::GetClassName(), 123 116 NetworkDeviceLog::GetClassName(), NetworkInterface::GetClassName(), NetworkInterfaceType::GetClassName(), 124 117 NetworkSubnet::GetClassName(), NetworkPort::GetClassName(), NetworkSpeedLimit::GetClassName(), … … 128 121 NetworkDomainItemFilter::GetClassName(), DeviceAPIType::GetClassName(), NetworkInterfaceWireless::GetClassName(), 129 122 NetworkInterfaceUpDown::GetClassName(), NetworkPortUpDown::GetClassName()); 123 124 // TODO: Make notify time configurable 125 $this->MinNotifyTime = 30; // seconds 130 126 } 131 127 -
trunk/Modules/Network/NetworkModels.php
r895 r899 3 3 class NetworkDomainAlias extends Model 4 4 { 5 static function Get Desc(): ModelDesc5 static function GetModelDesc(): ModelDesc 6 6 { 7 7 $Desc = new ModelDesc(self::GetClassName()); … … 16 16 class NetworkDevice extends Model 17 17 { 18 static function Get Desc(): ModelDesc18 static function GetModelDesc(): ModelDesc 19 19 { 20 20 $Desc = new ModelDesc(self::GetClassName()); … … 39 39 class NetworkDeviceType extends Model 40 40 { 41 static function Get Desc(): ModelDesc41 static function GetModelDesc(): ModelDesc 42 42 { 43 43 $Desc = new ModelDesc(self::GetClassName()); … … 51 51 class NetworkDeviceLog extends Model 52 52 { 53 static function Get Desc(): ModelDesc53 static function GetModelDesc(): ModelDesc 54 54 { 55 55 $Desc = new ModelDesc(self::GetClassName()); … … 64 64 class NetworkInterface extends Model 65 65 { 66 static function Get Desc(): ModelDesc66 static function GetModelDesc(): ModelDesc 67 67 { 68 68 $Desc = new ModelDesc(self::GetClassName()); … … 83 83 class NetworkInterfaceType extends Model 84 84 { 85 static function Get Desc(): ModelDesc85 static function GetModelDesc(): ModelDesc 86 86 { 87 87 $Desc = new ModelDesc(self::GetClassName()); … … 96 96 class NetworkSubnet extends Model 97 97 { 98 static function Get Desc(): ModelDesc98 static function GetModelDesc(): ModelDesc 99 99 { 100 100 $Desc = new ModelDesc(self::GetClassName()); … … 121 121 class NetworkPort extends Model 122 122 { 123 static function Get Desc(): ModelDesc123 static function GetModelDesc(): ModelDesc 124 124 { 125 125 $Desc = new ModelDesc(self::GetClassName()); … … 137 137 class NetworkSpeedLimit extends Model 138 138 { 139 static function Get Desc(): ModelDesc139 static function GetModelDesc(): ModelDesc 140 140 { 141 141 $Desc = new ModelDesc(self::GetClassName()); … … 150 150 class NetworkInterfaceLatency extends Model 151 151 { 152 static function Get Desc(): ModelDesc152 static function GetModelDesc(): ModelDesc 153 153 { 154 154 $Desc = new ModelDesc(self::GetClassName()); … … 162 162 class NetworkLink extends Model 163 163 { 164 static function Get Desc(): ModelDesc164 static function GetModelDesc(): ModelDesc 165 165 { 166 166 $Desc = new ModelDesc(self::GetClassName()); … … 174 174 class NetworkLinkType extends Model 175 175 { 176 static function Get Desc(): ModelDesc176 static function GetModelDesc(): ModelDesc 177 177 { 178 178 $Desc = new ModelDesc(self::GetClassName()); … … 188 188 class NetworkSignal extends Model 189 189 { 190 static function Get Desc(): ModelDesc190 static function GetModelDesc(): ModelDesc 191 191 { 192 192 $Desc = new ModelDesc(self::GetClassName()); … … 204 204 class NetworkAddressCategory extends Model 205 205 { 206 static function Get Desc(): ModelDesc206 static function GetModelDesc(): ModelDesc 207 207 { 208 208 $Desc = new ModelDesc(self::GetClassName()); … … 214 214 class NetworkDomain extends Model 215 215 { 216 static function Get Desc(): ModelDesc216 static function GetModelDesc(): ModelDesc 217 217 { 218 218 $Desc = new ModelDesc(self::GetClassName()); … … 232 232 class NetworkDomainServer extends Model 233 233 { 234 static function Get Desc(): ModelDesc234 static function GetModelDesc(): ModelDesc 235 235 { 236 236 $Desc = new ModelDesc(self::GetClassName()); … … 244 244 class NetworkDomainView extends Model 245 245 { 246 static function Get Desc(): ModelDesc246 static function GetModelDesc(): ModelDesc 247 247 { 248 248 $Desc = new ModelDesc(self::GetClassName()); … … 257 257 class NetworkDomainItemFilter extends Model 258 258 { 259 static function Get Desc(): ModelDesc259 static function GetModelDesc(): ModelDesc 260 260 { 261 261 $Desc = new ModelDesc(self::GetClassName()); … … 272 272 class DeviceAPIType extends Model 273 273 { 274 static function Get Desc(): ModelDesc274 static function GetModelDesc(): ModelDesc 275 275 { 276 276 $Desc = new ModelDesc(self::GetClassName()); … … 282 282 class NetworkInterfaceWireless extends Model 283 283 { 284 static function Get Desc(): ModelDesc284 static function GetModelDesc(): ModelDesc 285 285 { 286 286 $Desc = new ModelDesc(self::GetClassName()); … … 305 305 class NetworkDeviceConfig extends Model 306 306 { 307 static function Get Desc(): ModelDesc307 static function GetModelDesc(): ModelDesc 308 308 { 309 309 $Desc = new ModelDesc(self::GetClassName()); … … 318 318 class NetworkInterfaceUpDown extends Model 319 319 { 320 static function Get Desc(): ModelDesc320 static function GetModelDesc(): ModelDesc 321 321 { 322 322 $Desc = new ModelDesc(self::GetClassName()); … … 331 331 class NetworkPortUpDown extends Model 332 332 { 333 static function Get Desc(): ModelDesc333 static function GetModelDesc(): ModelDesc 334 334 { 335 335 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/NetworkConfig/NetworkConfig.php
r894 r899 1 1 <?php 2 2 3 class ModuleNetworkConfig extends AppModule3 class ModuleNetworkConfig extends Module 4 4 { 5 5 public array $ConfigItems; … … 11 11 $this->Version = '1.0'; 12 12 $this->Creator = 'Chronos'; 13 $this->License = 'GNU/GPL ';13 $this->License = 'GNU/GPLv3'; 14 14 $this->Description = 'Network device remote configuration'; 15 $this->Dependencies = array('Network'); 15 $this->Dependencies = array(ModuleNetwork::GetName()); 16 $this->Models = array(NetworkConfigurationLog::GetClassName(), NetworkConfiguration::GetClassName()); 17 16 18 $this->ConfigItems = array(); 17 }18 19 function GetModels(): array20 {21 return array(NetworkConfigurationLog::GetClassName(), NetworkConfiguration::GetClassName());22 19 } 23 20 … … 90 87 } 91 88 92 static function Cast( AppModule $AppModule): ModuleNetworkConfig89 static function Cast(Module $Module): ModuleNetworkConfig 93 90 { 94 if ($ AppModule instanceof ModuleNetworkConfig)91 if ($Module instanceof ModuleNetworkConfig) 95 92 { 96 return $ AppModule;93 return $Module; 97 94 } 98 throw new Exception('Expected ModuleNetworkConfig type but got '.gettype($ AppModule));95 throw new Exception('Expected ModuleNetworkConfig type but got '.gettype($Module)); 99 96 } 100 97 } … … 109 106 class NetworkConfiguration extends Model 110 107 { 111 static function Get Desc(): ModelDesc108 static function GetModelDesc(): ModelDesc 112 109 { 113 110 $Desc = new ModelDesc(self::GetClassName()); … … 125 122 class NetworkConfigurationLog extends Model 126 123 { 127 static function Get Desc(): ModelDesc124 static function GetModelDesc(): ModelDesc 128 125 { 129 126 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/NetworkConfigAirOS/NetworkConfigAirOS.php
r894 r899 3 3 include_once(dirname(__FILE__).'/Generators/Signal.php'); 4 4 5 class ModuleNetworkConfigAirOS extends AppModule5 class ModuleNetworkConfigAirOS extends Module 6 6 { 7 7 function __construct(System $System) … … 11 11 $this->Version = '1.0'; 12 12 $this->Creator = 'Chronos'; 13 $this->License = 'GNU/GPL ';13 $this->License = 'GNU/GPLv3'; 14 14 $this->Description = 'Network service configuration of Ubiquity AirOS devices'; 15 $this->Dependencies = array( 'NetworkConfig');15 $this->Dependencies = array(ModuleNetworkConfig::GetName()); 16 16 } 17 17 -
trunk/Modules/NetworkConfigLinux/NetworkConfigLinux.php
r894 r899 5 5 include_once(dirname(__FILE__).'/Generators/Latency.php'); 6 6 7 class ModuleNetworkConfigLinux extends AppModule7 class ModuleNetworkConfigLinux extends Module 8 8 { 9 9 function __construct(System $System) … … 15 15 $this->License = 'GNU/GPL'; 16 16 $this->Description = 'Network service configuration of Linux server'; 17 $this->Dependencies = array( 'NetworkConfig');17 $this->Dependencies = array(ModuleNetworkConfig::GetName()); 18 18 } 19 19 -
trunk/Modules/NetworkConfigRouterOS/Generators/Queue.php
r887 r899 273 273 echo($Main->Print()); 274 274 $ItemsQueue = $Main->GetCommands(); 275 //print_r($ItemsQueue);276 //die();277 278 //print_r($ItemsQueue);279 275 $Routerboard->ListUpdate($PathQueue, array('name', 'limit-at', 'max-limit', 'parent', 'packet-mark'), $ItemsQueue, array(), true); 280 276 } -
trunk/Modules/NetworkConfigRouterOS/NetworkConfigRouterOS.php
r894 r899 16 16 include_once(dirname(__FILE__).'/Generators/Queue.php'); 17 17 18 class ModuleNetworkConfigRouterOS extends AppModule18 class ModuleNetworkConfigRouterOS extends Module 19 19 { 20 20 function __construct(System $System) … … 24 24 $this->Version = '1.0'; 25 25 $this->Creator = 'Chronos'; 26 $this->License = 'GNU/GPL ';26 $this->License = 'GNU/GPLv3'; 27 27 $this->Description = 'Mikrotik RouterOS configuration'; 28 $this->Dependencies = array( 'NetworkConfig');28 $this->Dependencies = array(ModuleNetworkConfig::GetName()); 29 29 } 30 30 -
trunk/Modules/NetworkShare/NetworkShare.php
r894 r899 5 5 include_once('SharePage.php'); 6 6 7 class ModuleNetworkShare extends AppModule7 class ModuleNetworkShare extends Module 8 8 { 9 9 function __construct(System $System) … … 13 13 $this->Version = '1.0'; 14 14 $this->Creator = 'Chronos'; 15 $this->License = 'GNU/GPL ';15 $this->License = 'GNU/GPLv3'; 16 16 $this->Description = 'System for loading network computer share file list and allow fast searching.'; 17 $this->Dependencies = array('Network'); 18 } 19 20 function GetModels(): array 21 { 22 return array(NetworkShareItem::GetClassName(), NetworkShareError::GetClassName()); 17 $this->Dependencies = array(ModuleNetwork::GetName()); 18 $this->Models = array(NetworkShareItem::GetClassName(), NetworkShareError::GetClassName()); 23 19 } 24 20 … … 31 27 class NetworkShareItem extends Model 32 28 { 33 static function Get Desc(): ModelDesc29 static function GetModelDesc(): ModelDesc 34 30 { 35 31 $Desc = new ModelDesc('NetworkShareItem'); … … 47 43 class NetworkShareError extends Model 48 44 { 49 static function Get Desc(): ModelDesc45 static function GetModelDesc(): ModelDesc 50 46 { 51 47 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/NetworkShare/browse.php
r874 r899 38 38 } 39 39 //ShowArray($Shares); 40 //die();41 40 42 41 // Analyzuj slozku a projdi podslozky -
trunk/Modules/NetworkTopology/NetworkTopology.php
r894 r899 135 135 } 136 136 137 class ModuleNetworkTopology extends AppModule137 class ModuleNetworkTopology extends Module 138 138 { 139 139 function __construct(System $System) … … 143 143 $this->Version = '1.0'; 144 144 $this->Creator = 'Chronos'; 145 $this->License = 'GNU/GPL ';145 $this->License = 'GNU/GPLv3'; 146 146 $this->Description = 'Generate image of network device interconnection'; 147 $this->Dependencies = array('Network'); 148 } 149 150 function GetModels(): array 151 { 152 return array(NetworkTopology::GetClassName()); 147 $this->Dependencies = array(ModuleNetwork::GetName()); 148 $this->Models = array(NetworkTopology::GetClassName()); 153 149 } 154 150 … … 161 157 class NetworkTopology extends Model 162 158 { 163 static function Get Desc(): ModelDesc159 static function GetModelDesc(): ModelDesc 164 160 { 165 161 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/News/News.php
r894 r899 11 11 } 12 12 13 class ModuleNews extends AppModule13 class ModuleNews extends Module 14 14 { 15 15 public int $NewsCountPerCategory = 3; … … 22 22 $this->Version = '1.0'; 23 23 $this->Creator = 'Chronos'; 24 $this->License = 'GNU/GPL ';24 $this->License = 'GNU/GPLv3'; 25 25 $this->Description = 'News and news groups management'; 26 $this->Dependencies = array( 'User', 'Log', 'File');26 $this->Dependencies = array(ModuleUser::GetName(), ModuleLog::GetName(), ModuleFile::GetName()); 27 27 $this->SupportedModules = array('Search'); 28 } 29 30 function GetModels(): array 31 { 32 return array(NewsCategory::GetClassName(), News::GetClassName()); 28 $this->Models = array(NewsCategory::GetClassName(), News::GetClassName()); 33 29 } 34 30 … … 272 268 } 273 269 274 static function Cast( AppModule $AppModule): ModuleNews275 { 276 if ($ AppModule instanceof ModuleNews)277 { 278 return $ AppModule;279 } 280 throw new Exception('Expected ModuleNews type but got '.gettype($ AppModule));270 static function Cast(Module $Module): ModuleNews 271 { 272 if ($Module instanceof ModuleNews) 273 { 274 return $Module; 275 } 276 throw new Exception('Expected ModuleNews type but got '.gettype($Module)); 281 277 } 282 278 } … … 284 280 class News extends Model 285 281 { 286 static function Get Desc(): ModelDesc282 static function GetModelDesc(): ModelDesc 287 283 { 288 284 $Desc = new ModelDesc(self::GetClassName()); … … 302 298 class NewsCategory extends Model 303 299 { 304 static function Get Desc(): ModelDesc300 static function GetModelDesc(): ModelDesc 305 301 { 306 302 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Notify/Notify.php
r894 r899 3 3 define('CONTACT_CATEGORY_EMAIL', 4); 4 4 5 class ModuleNotify extends AppModule5 class ModuleNotify extends Module 6 6 { 7 7 public array $Checks; … … 13 13 $this->Version = '1.0'; 14 14 $this->Creator = 'Chronos'; 15 $this->License = 'GNU/GPL ';15 $this->License = 'GNU/GPLv3'; 16 16 $this->Description = 'Send notification messages to selected users'; 17 $this->Dependencies = array('User', 'RSS'); 17 $this->Dependencies = array(ModuleUser::GetName(), ModuleRSS::GetName()); 18 $this->Models = array(NotifyCategory::GetClassName(), NotifyUser::GetClassName()); 19 18 20 $this->Checks = array(); 19 21 } … … 128 130 } 129 131 130 function GetModels(): array131 {132 return array(NotifyCategory::GetClassName(), NotifyUser::GetClassName());133 }134 135 132 function DoInstall(): void 136 133 { … … 176 173 } 177 174 178 static function Cast( AppModule $AppModule): ModuleNotify179 { 180 if ($ AppModule instanceof ModuleNotify)181 { 182 return $ AppModule;183 } 184 throw new Exception('Expected ModuleNotify type but got '.gettype($ AppModule));175 static function Cast(Module $Module): ModuleNotify 176 { 177 if ($Module instanceof ModuleNotify) 178 { 179 return $Module; 180 } 181 throw new Exception('Expected ModuleNotify type but got '.gettype($Module)); 185 182 } 186 183 } … … 188 185 class NotifyCategory extends Model 189 186 { 190 static function Get Desc(): ModelDesc187 static function GetModelDesc(): ModelDesc 191 188 { 192 189 $Desc = new ModelDesc(self::GetClassName()); … … 199 196 class NotifyUser extends Model 200 197 { 201 static function Get Desc(): ModelDesc198 static function GetModelDesc(): ModelDesc 202 199 { 203 200 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/OpeningHours/OpeningHours.php
r894 r899 215 215 } 216 216 217 class ModuleOpeningHours extends AppModule217 class ModuleOpeningHours extends Module 218 218 { 219 219 function __construct(System $System) … … 223 223 $this->Version = '1.0'; 224 224 $this->Creator = 'Chronos'; 225 $this->License = 'GNU/GPL ';225 $this->License = 'GNU/GPLv3'; 226 226 $this->Description = 'Show subject opening hours with time to open or time to close'; 227 $this->Dependencies = array(); 228 } 229 230 function GetModels(): array 231 { 232 return array(SubjectOpenTime::GetClassName(), SubjectOpenTimeDay::GetClassName()); 227 $this->Models = array(SubjectOpenTime::GetClassName(), SubjectOpenTimeDay::GetClassName()); 233 228 } 234 229 … … 246 241 class SubjectOpenTime extends Model 247 242 { 248 static function Get Desc(): ModelDesc243 static function GetModelDesc(): ModelDesc 249 244 { 250 245 $Desc = new ModelDesc(self::GetClassName()); … … 259 254 class SubjectOpenTimeDay extends Model 260 255 { 261 static function Get Desc(): ModelDesc256 static function GetModelDesc(): ModelDesc 262 257 { 263 258 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Portal/Portal.php
r896 r899 3 3 include_once(dirname(__FILE__).'/../../Common/Global.php'); 4 4 5 class ModulePortal extends AppModule5 class ModulePortal extends Module 6 6 { 7 7 function __construct(System $System) … … 13 13 $this->License = 'GNU/GPLv3'; 14 14 $this->Description = 'Community portal.'; 15 $this->Dependencies = array('News', 'User'); 16 } 17 18 function GetModels(): array 19 { 20 return array(Panel::GetClassName(), PanelColumn::GetClassName()); 15 $this->Dependencies = array(ModuleNews::GetName(), ModuleUser::GetName()); 16 $this->Models = array(Panel::GetClassName(), PanelColumn::GetClassName()); 21 17 } 22 18 … … 65 61 class PanelColumn extends Model 66 62 { 67 static function Get Desc(): ModelDesc63 static function GetModelDesc(): ModelDesc 68 64 { 69 65 $Desc = new ModelDesc(self::GetClassName()); … … 75 71 class Panel extends Model 76 72 { 77 static function Get Desc(): ModelDesc73 static function GetModelDesc(): ModelDesc 78 74 { 79 75 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/RSS/RSS.php
r887 r899 1 1 <?php 2 2 3 class ModuleRSS extends AppModule3 class ModuleRSS extends Module 4 4 { 5 5 public array $RSSChannels; … … 11 11 $this->Version = '1.0'; 12 12 $this->Creator = 'Chronos'; 13 $this->License = 'GNU/GPL ';13 $this->License = 'GNU/GPLv3'; 14 14 $this->Description = 'Web site RSS channel management'; 15 $this->Dependencies = array();16 15 $this->RSSChannels = array(); 17 16 } … … 20 19 { 21 20 $this->System->RegisterPage(['rss'], 'PageRSS'); 22 $this->System->RegisterPageHeader('RSS', array($this, 'ShowRSSHeader'));21 Core::Cast($this->System)->RegisterPageHeader('RSS', array($this, 'ShowRSSHeader')); 23 22 } 24 23 … … 52 51 } 53 52 54 static function Cast( AppModule $AppModule): ModuleRSS53 static function Cast(Module $Module): ModuleRSS 55 54 { 56 if ($ AppModule instanceof ModuleRSS)55 if ($Module instanceof ModuleRSS) 57 56 { 58 return $ AppModule;57 return $Module; 59 58 } 60 throw new Exception('Expected ModuleRSS type but got '.gettype($ AppModule));59 throw new Exception('Expected ModuleRSS type but got '.gettype($Module)); 61 60 } 62 61 } -
trunk/Modules/Scheduler/Scheduler.php
r894 r899 1 1 <?php 2 2 3 class ModuleScheduler extends AppModule3 class ModuleScheduler extends Module 4 4 { 5 5 function __construct(System $System) … … 9 9 $this->Version = '1.0'; 10 10 $this->Creator = 'Chronos'; 11 $this->License = 'GNU/GPL ';11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Allow to setup and execute planned and recurring tasks'; 13 $this->Dependencies = array(); 14 } 15 16 function GetModels(): array 17 { 18 return array(SchedulerAction::GetClassName(), Scheduler::GetClassName()); 13 $this->Models = array(SchedulerAction::GetClassName(), Scheduler::GetClassName()); 19 14 } 20 15 … … 99 94 } 100 95 101 static function Cast( AppModule $AppModule): ModuleScheduler96 static function Cast(Module $Module): ModuleScheduler 102 97 { 103 if ($ AppModule instanceof ModuleScheduler)98 if ($Module instanceof ModuleScheduler) 104 99 { 105 return $ AppModule;100 return $Module; 106 101 } 107 throw new Exception('Expected ModuleScheduler type but got '.gettype($ AppModule));102 throw new Exception('Expected ModuleScheduler type but got '.gettype($Module)); 108 103 } 109 104 } … … 128 123 class Scheduler extends Model 129 124 { 130 static function Get Desc(): ModelDesc125 static function GetModelDesc(): ModelDesc 131 126 { 132 127 $Desc = new ModelDesc(self::GetClassName()); … … 145 140 class SchedulerAction extends Model 146 141 { 147 static function Get Desc(): ModelDesc142 static function GetModelDesc(): ModelDesc 148 143 { 149 144 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Search/Search.php
r894 r899 47 47 } 48 48 49 class ModuleSearch extends AppModule49 class ModuleSearch extends Module 50 50 { 51 51 public array $Items; … … 58 58 $this->Version = '1.0'; 59 59 $this->Creator = 'Chronos'; 60 $this->License = 'GNU/GPL ';60 $this->License = 'GNU/GPLv3'; 61 61 $this->Description = 'Allow search through registered content objects'; 62 $this->Dependencies = array(); 62 63 63 $this->MaxItemCount = 10; 64 64 $this->Items = array(); … … 75 75 } 76 76 77 static function Cast( AppModule $AppModule): ModuleSearch77 static function Cast(Module $Module): ModuleSearch 78 78 { 79 if ($ AppModule instanceof ModuleSearch)79 if ($Module instanceof ModuleSearch) 80 80 { 81 return $ AppModule;81 return $Module; 82 82 } 83 throw new Exception('Expected ModuleSearch type but got '.gettype($ AppModule));83 throw new Exception('Expected ModuleSearch type but got '.gettype($Module)); 84 84 } 85 85 } -
trunk/Modules/SpeedTest/SpeedTest.php
r887 r899 12 12 ############################################################################### 13 13 14 class ModuleSpeedTest extends AppModule14 class ModuleSpeedTest extends Module 15 15 { 16 16 function __construct(System $System) … … 20 20 $this->Version = '1.0'; 21 21 $this->Creator = 'Chronos'; 22 $this->License = 'GNU/GPL ';22 $this->License = 'GNU/GPLv3'; 23 23 $this->Description = 'Testing of download and upload bandwidth'; 24 $this->Dependencies = array();25 24 } 26 25 -
trunk/Modules/Stock/Stock.php
r894 r899 1 1 <?php 2 2 3 class ModuleStock extends AppModule3 class ModuleStock extends Module 4 4 { 5 5 function __construct(System $System) … … 9 9 $this->Version = '1.0'; 10 10 $this->Creator = 'Chronos'; 11 $this->License = 'GNU/GPL ';11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Stock and products'; 13 $this->Dependencies = array('User', 'Customer', 'Network'); 14 } 15 16 function GetModels(): array 17 { 18 return array(Product::GetClassName(), StockSerialNumber::GetClassName(), Stock::GetClassName(), 13 $this->Dependencies = array(ModuleUser::GetName(), ModuleCustomer::GetName(), ModuleNetwork::GetName()); 14 $this->Models = array(Product::GetClassName(), StockSerialNumber::GetClassName(), Stock::GetClassName(), 19 15 StockMoveGroup::GetClassName(), StockMove::GetClassName(), StockMoveItem::GetClassName(), 20 16 StockItemHistory::GetClassName(), StockMoveItemSerialRel::GetClassName()); … … 266 262 class Product extends Model 267 263 { 268 static function Get Desc(): ModelDesc264 static function GetModelDesc(): ModelDesc 269 265 { 270 266 $Desc = new ModelDesc(self::GetClassName()); … … 285 281 class StockSerialNumber extends Model 286 282 { 287 static function Get Desc(): ModelDesc283 static function GetModelDesc(): ModelDesc 288 284 { 289 285 $Desc = new ModelDesc(self::GetClassName()); … … 305 301 class Stock extends Model 306 302 { 307 static function Get Desc(): ModelDesc303 static function GetModelDesc(): ModelDesc 308 304 { 309 305 $Desc = new ModelDesc(self::GetClassName()); … … 315 311 class StockMove extends Model 316 312 { 317 static function Get Desc(): ModelDesc313 static function GetModelDesc(): ModelDesc 318 314 { 319 315 $Desc = new ModelDesc(self::GetClassName()); … … 328 324 class StockMoveItem extends Model 329 325 { 330 static function Get Desc(): ModelDesc326 static function GetModelDesc(): ModelDesc 331 327 { 332 328 $Desc = new ModelDesc(self::GetClassName()); … … 341 337 class StockMoveGroup extends Model 342 338 { 343 static function Get Desc(): ModelDesc339 static function GetModelDesc(): ModelDesc 344 340 { 345 341 $Desc = new ModelDesc(self::GetClassName()); … … 354 350 class StockItemHistory extends Model 355 351 { 356 static function Get Desc(): ModelDesc352 static function GetModelDesc(): ModelDesc 357 353 { 358 354 $Desc = new ModelDesc(self::GetClassName()); … … 366 362 class StockMoveItemSerialRel extends Model 367 363 { 368 static function Get Desc(): ModelDesc364 static function GetModelDesc(): ModelDesc 369 365 { 370 366 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Subject/Subject.php
r897 r899 1 1 <?php 2 2 3 class ModuleSubject extends AppModule3 class ModuleSubject extends Module 4 4 { 5 5 function __construct(System $System) … … 9 9 $this->Version = '1.0'; 10 10 $this->Creator = 'Chronos'; 11 $this->License = 'GNU/GPL ';11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Subject management'; 13 $this->Dependencies = array('User', 'Map'); 13 $this->Dependencies = array(ModuleUser::GetName(), ModuleMap::GetName()); 14 $this->Models = array(Subject::GetClassName(), ContactCategory::GetClassName(), 15 Contact::GetClassName()); 14 16 } 15 17 … … 131 133 } 132 134 133 function GetModels(): array134 {135 return array(Subject::GetClassName(), ContactCategory::GetClassName(),136 Contact::GetClassName());137 }138 139 135 function ShowDashboardItem(): string 140 136 { … … 148 144 class Subject extends Model 149 145 { 150 static function Get Desc(): ModelDesc146 static function GetModelDesc(): ModelDesc 151 147 { 152 148 $Desc = new ModelDesc(self::GetClassName()); … … 168 164 class Contact extends Model 169 165 { 170 static function Get Desc(): ModelDesc166 static function GetModelDesc(): ModelDesc 171 167 { 172 168 $Desc = new ModelDesc(self::GetClassName()); … … 183 179 class ContactCategory extends Model 184 180 { 185 static function Get Desc(): ModelDesc181 static function GetModelDesc(): ModelDesc 186 182 { 187 183 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/System/System.php
r897 r899 3 3 include_once(dirname(__FILE__).'/SystemModels.php'); 4 4 5 class ModuleSystem extends AppModule5 class ModuleSystem extends Module 6 6 { 7 7 public bool $InstalledChecked; … … 13 13 $this->Version = '1.0'; 14 14 $this->Creator = 'Chronos'; 15 $this->License = 'GNU/GPL ';15 $this->License = 'GNU/GPLv3'; 16 16 $this->Description = 'Base system module'; 17 $this->Dependencies = array();18 17 $this->Type = ModuleType::System; 19 } 20 21 function GetModels(): array 22 { 23 return array(UnitOfMeasure::GetClassName(), ActionIcon::GetClassName(), ActionGroup::GetClassName(), 18 $this->Models = array(UnitOfMeasure::GetClassName(), ActionIcon::GetClassName(), ActionGroup::GetClassName(), 24 19 ActionType::GetClassName(), Action::GetClassName(), Language::GetClassName(), Country::GetClassName()); 25 20 } … … 141 136 } 142 137 143 static function Cast( AppModule $AppModule): ModuleSystem138 static function Cast(Module $Module): ModuleSystem 144 139 { 145 if ($ AppModule instanceof ModuleSystem)140 if ($Module instanceof ModuleSystem) 146 141 { 147 return $ AppModule;142 return $Module; 148 143 } 149 throw new Exception('Expected ModuleSystem type but got '.gettype($ AppModule));144 throw new Exception('Expected ModuleSystem type but got '.gettype($Module)); 150 145 } 151 146 -
trunk/Modules/System/SystemModels.php
r895 r899 3 3 class UnitOfMeasure extends Model 4 4 { 5 static function Get Desc(): ModelDesc5 static function GetModelDesc(): ModelDesc 6 6 { 7 7 $Desc = new ModelDesc(self::GetClassName()); … … 14 14 class Action extends Model 15 15 { 16 static function Get Desc(): ModelDesc16 static function GetModelDesc(): ModelDesc 17 17 { 18 18 $Desc = new ModelDesc(self::GetClassName()); … … 30 30 class ActionIcon extends Model 31 31 { 32 static function Get Desc(): ModelDesc32 static function GetModelDesc(): ModelDesc 33 33 { 34 34 $Desc = new ModelDesc(self::GetClassName()); … … 40 40 class ActionGroup extends Model 41 41 { 42 static function Get Desc(): ModelDesc42 static function GetModelDesc(): ModelDesc 43 43 { 44 44 $Desc = new ModelDesc(self::GetClassName()); … … 50 50 class ActionType extends Model 51 51 { 52 static function Get Desc(): ModelDesc52 static function GetModelDesc(): ModelDesc 53 53 { 54 54 $Desc = new ModelDesc(self::GetClassName()); … … 60 60 class Language extends Model 61 61 { 62 static function Get Desc(): ModelDesc62 static function GetModelDesc(): ModelDesc 63 63 { 64 64 $Desc = new ModelDesc(self::GetClassName()); … … 70 70 class Country extends Model 71 71 { 72 static function Get Desc(): ModelDesc72 static function GetModelDesc(): ModelDesc 73 73 { 74 74 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/TV/TV.php
r894 r899 99 99 } 100 100 101 class ModuleTV extends AppModule101 class ModuleTV extends Module 102 102 { 103 103 function __construct(System $System) … … 109 109 $this->License = 'GNU/GPLv3'; 110 110 $this->Description = 'Television channels management'; 111 $this->Dependencies = array(); 112 } 113 114 function GetModels(): array 115 { 116 return array(TVGroup::GetClassName(), TV::GetClassName()); 111 $this->Models = array(TVGroup::GetClassName(), TV::GetClassName()); 117 112 } 118 113 … … 166 161 class TVGroup extends Model 167 162 { 168 static function Get Desc(): ModelDesc163 static function GetModelDesc(): ModelDesc 169 164 { 170 165 $Desc = new ModelDesc(self::GetClassName()); … … 176 171 class TV extends Model 177 172 { 178 static function Get Desc(): ModelDesc173 static function GetModelDesc(): ModelDesc 179 174 { 180 175 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/Task/Task.php
r894 r899 1 1 <?php 2 2 3 class ModuleTask extends AppModule3 class ModuleTask extends Module 4 4 { 5 5 function __construct(System $System) … … 9 9 $this->Version = '1.0'; 10 10 $this->Creator = 'Chronos'; 11 $this->License = 'GNU/GPL ';11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Work and task management'; 13 $this->Dependencies = array('User'); 14 } 15 16 function GetModels(): array 17 { 18 return array(TaskGroup::GetClassName(), Task::GetClassName(), Work::GetClassName()); 13 $this->Dependencies = array(ModuleUser::GetName()); 14 $this->Models = array(TaskGroup::GetClassName(), Task::GetClassName(), Work::GetClassName()); 19 15 } 20 16 … … 109 105 class Task extends Model 110 106 { 111 static function Get Desc(): ModelDesc107 static function GetModelDesc(): ModelDesc 112 108 { 113 109 $Desc = new ModelDesc(self::GetClassName()); … … 129 125 class TaskGroup extends Model 130 126 { 131 static function Get Desc(): ModelDesc127 static function GetModelDesc(): ModelDesc 132 128 { 133 129 $Desc = new ModelDesc(self::GetClassName()); … … 141 137 class Work extends Model 142 138 { 143 static function Get Desc(): ModelDesc139 static function GetModelDesc(): ModelDesc 144 140 { 145 141 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/TimeMeasure/Measure.php
r894 r899 12 12 public array $ValueTypes = array('Min', 'Avg', 'Max'); 13 13 14 static function Get Desc(): ModelDesc14 static function GetModelDesc(): ModelDesc 15 15 { 16 16 $Desc = new ModelDesc(self::GetClassName()); … … 329 329 } 330 330 // array_pop($Values); 331 // echo('abc');332 // die();333 331 if ($this->Debug) echo('Item count: '.count($Values)); 334 332 -
trunk/Modules/TimeMeasure/TimeMeasure.php
r894 r899 5 5 include_once(dirname(__FILE__).'/Main.php'); 6 6 7 class ModuleTimeMeasure extends AppModule7 class ModuleTimeMeasure extends Module 8 8 { 9 9 function __construct(System $System) … … 15 15 $this->License = 'GNU/GPLv3'; 16 16 $this->Description = 'Time measure of custom values, char'; 17 $this->Dependencies = array('User'); 18 } 19 20 function GetModels(): array 21 { 22 return array(Measure::GetClassName()); 17 $this->Dependencies = array(ModuleUser::GetName()); 18 $this->Models = array(Measure::GetClassName()); 23 19 } 24 20 -
trunk/Modules/User/User.php
r896 r899 5 5 include_once(dirname(__FILE__).'/UserPage.php'); 6 6 7 class ModuleUser extends AppModule7 class ModuleUser extends Module 8 8 { 9 9 public array $UserPanel; … … 18 18 $this->License = 'GNU/GPLv3'; 19 19 $this->Description = 'User management'; 20 $this->Dependencies = array(); 20 $this->Models = array(User::GetClassName(), UserOnline::GetClassName(), PermissionGroup::GetClassName(), PermissionOperation::GetClassName(), 21 PermissionGroupAssignment::GetClassName(), PermissionUserAssignment::GetClassName()); 22 21 23 $this->UserPanel = array(); 22 24 $this->User = new User($System); 23 }24 25 function GetModels(): array26 {27 return array(User::GetClassName(), UserOnline::GetClassName(), PermissionGroup::GetClassName(), PermissionOperation::GetClassName(),28 PermissionGroupAssignment::GetClassName(), PermissionUserAssignment::GetClassName());29 25 } 30 26 … … 208 204 } 209 205 210 static function Cast( AppModule $AppModule): ModuleUser211 { 212 if ($ AppModule instanceof ModuleUser)206 static function Cast(Module $Module): ModuleUser 207 { 208 if ($Module instanceof ModuleUser) 213 209 { 214 return $ AppModule;210 return $Module; 215 211 } 216 throw new Exception('Expected ModuleUser type but got '.gettype($ AppModule));212 throw new Exception('Expected ModuleUser type but got '.gettype($Module)); 217 213 } 218 214 } -
trunk/Modules/User/UserModel.php
r897 r899 65 65 } 66 66 67 static function Get Desc(): ModelDesc67 static function GetModelDesc(): ModelDesc 68 68 { 69 69 $Desc = new ModelDesc(self::GetClassName()); … … 461 461 class UserOnline extends Model 462 462 { 463 static function Get Desc(): ModelDesc463 static function GetModelDesc(): ModelDesc 464 464 { 465 465 $Desc = new ModelDesc(self::GetClassName()); … … 480 480 class PermissionGroup extends Model 481 481 { 482 static function Get Desc(): ModelDesc482 static function GetModelDesc(): ModelDesc 483 483 { 484 484 $Desc = new ModelDesc(self::GetClassName()); … … 490 490 class PermissionGroupAssignment extends Model 491 491 { 492 static function Get Desc(): ModelDesc492 static function GetModelDesc(): ModelDesc 493 493 { 494 494 $Desc = new ModelDesc(self::GetClassName()); … … 502 502 class PermissionOperation extends Model 503 503 { 504 static function Get Desc(): ModelDesc504 static function GetModelDesc(): ModelDesc 505 505 { 506 506 $Desc = new ModelDesc(self::GetClassName()); … … 516 516 class PermissionUserAssignment extends Model 517 517 { 518 static function Get Desc(): ModelDesc518 static function GetModelDesc(): ModelDesc 519 519 { 520 520 $Desc = new ModelDesc(self::GetClassName()); -
trunk/Modules/VPS/VPS.php
r887 r899 1 1 <?php 2 2 3 class ModuleVPS extends AppModule3 class ModuleVPS extends Module 4 4 { 5 5 function __construct(System $System) … … 10 10 $this->Version = '1.0'; 11 11 $this->Creator = 'Chronos'; 12 $this->License = 'GNU/GPL ';12 $this->License = 'GNU/GPLv3'; 13 13 $this->Description = 'VPS(Virtual Private Server) hosting management'; 14 $this->Dependencies = array('User', 'Network', 'Subject'); 15 $this->Modules = array(); 16 } 17 18 function DoStart(): void 19 { 20 21 } 22 23 function DoInstall(): void 24 { 25 14 $this->Dependencies = array(ModuleUser::GetName(), ModuleNetwork::GetName(), ModuleSubject::GetName()); 26 15 } 27 16 } -
trunk/Modules/WebCam/WebCam.php
r887 r899 48 48 } 49 49 50 class ModuleWebCam extends AppModule50 class ModuleWebCam extends Module 51 51 { 52 52 public string $ImageFileName = 'webcam.jpg'; … … 58 58 $this->Version = '1.0'; 59 59 $this->Creator = 'Chronos'; 60 $this->License = 'GNU/GPL ';60 $this->License = 'GNU/GPLv3'; 61 61 $this->Description = 'Web camera image presentetation'; 62 $this->Dependencies = array();63 $this->SupportedModels = array();64 62 } 65 63 … … 81 79 } 82 80 83 static function Cast( AppModule $AppModule): ModuleWebCam81 static function Cast(Module $Module): ModuleWebCam 84 82 { 85 if ($ AppModule instanceof ModuleWebCam)83 if ($Module instanceof ModuleWebCam) 86 84 { 87 return $ AppModule;85 return $Module; 88 86 } 89 throw new Exception('Expected ModuleWebCam type but got '.gettype($ AppModule));87 throw new Exception('Expected ModuleWebCam type but got '.gettype($Module)); 90 88 } 91 89 } -
trunk/Modules/Wiki/Wiki.php
r897 r899 1 1 <?php 2 2 3 class ModuleWiki extends AppModule3 class ModuleWiki extends Module 4 4 { 5 5 function __construct(System $System) … … 11 11 $this->License = 'GNU/GPLv3'; 12 12 $this->Description = 'Mediawiki style page management'; 13 $this->Dependencies = array('User'); 14 $this->Revision = 1; 15 } 16 17 function GetModels(): array 18 { 19 return array(WikiPage::GetClassName(), WikiPageContent::GetClassName()); 13 $this->Dependencies = array(ModuleUser::GetName()); 14 $this->Models = array(WikiPage::GetClassName(), WikiPageContent::GetClassName()); 20 15 } 21 16 … … 44 39 class WikiPage extends Model 45 40 { 46 static function Get Desc(): ModelDesc41 static function GetModelDesc(): ModelDesc 47 42 { 48 43 $Desc = new ModelDesc(self::GetClassName()); … … 56 51 class WikiPageContent extends Model 57 52 { 58 static function Get Desc(): ModelDesc53 static function GetModelDesc(): ModelDesc 59 54 { 60 55 $Desc = new ModelDesc(self::GetClassName());
Note:
See TracChangeset
for help on using the changeset viewer.
