@@ -114,8 +114,8 @@ discard block |
||
| 114 | 114 | $this->messages = []; |
| 115 | 115 | $this->db = $this->di->getShared('db'); |
| 116 | 116 | $this->config = $this->di->getShared('config'); |
| 117 | - $this->license = $this->di->getShared('license'); |
|
| 118 | - $this->moduleDir = $this->config->path('core.modulesDir') . '/' . $this->moduleUniqueID; |
|
| 117 | + $this->license = $this->di->getShared('license'); |
|
| 118 | + $this->moduleDir = $this->config->path('core.modulesDir').'/'.$this->moduleUniqueID; |
|
| 119 | 119 | $settings_file = "{$this->moduleDir}/module.json"; |
| 120 | 120 | if (file_exists($settings_file)) { |
| 121 | 121 | $module_settings = json_decode(file_get_contents($settings_file), true); |
@@ -139,7 +139,7 @@ discard block |
||
| 139 | 139 | } |
| 140 | 140 | } |
| 141 | 141 | |
| 142 | - $this->messages = []; |
|
| 142 | + $this->messages = []; |
|
| 143 | 143 | |
| 144 | 144 | |
| 145 | 145 | } |
@@ -154,21 +154,21 @@ discard block |
||
| 154 | 154 | { |
| 155 | 155 | $result = true; |
| 156 | 156 | try { |
| 157 | - if ( ! $this->activateLicense()) { |
|
| 157 | + if (!$this->activateLicense()) { |
|
| 158 | 158 | $this->messages[] = 'License activate error'; |
| 159 | 159 | $result = false; |
| 160 | 160 | } |
| 161 | - if ( ! $this->installFiles()) { |
|
| 161 | + if (!$this->installFiles()) { |
|
| 162 | 162 | $this->messages[] = ' installFiles error'; |
| 163 | 163 | $result = false; |
| 164 | 164 | } |
| 165 | - if ( ! $this->installDB()) { |
|
| 165 | + if (!$this->installDB()) { |
|
| 166 | 166 | $this->messages[] = ' installDB error'; |
| 167 | 167 | $result = false; |
| 168 | 168 | } |
| 169 | 169 | $this->fixFilesRights(); |
| 170 | 170 | } catch (\Exception $exception) { |
| 171 | - $result = false; |
|
| 171 | + $result = false; |
|
| 172 | 172 | $this->messages[] = $exception->getMessage(); |
| 173 | 173 | } |
| 174 | 174 | |
@@ -199,7 +199,7 @@ discard block |
||
| 199 | 199 | PbxExtensionUtils::createAgiBinSymlinks($this->moduleUniqueID); |
| 200 | 200 | |
| 201 | 201 | // Restore database settings |
| 202 | - $modulesDir = $this->config->path('core.modulesDir'); |
|
| 202 | + $modulesDir = $this->config->path('core.modulesDir'); |
|
| 203 | 203 | $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}"; |
| 204 | 204 | if (is_dir($backupPath)) { |
| 205 | 205 | $cpPath = Util::which('cp'); |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | "{$this->moduleDir}/bin" |
| 223 | 223 | ]; |
| 224 | 224 | foreach ($dirs as $dir) { |
| 225 | - if(file_exists($dir) && is_dir($dir)){ |
|
| 225 | + if (file_exists($dir) && is_dir($dir)) { |
|
| 226 | 226 | // Add executable right to module's binary |
| 227 | 227 | Util::addExecutableRights($dir); |
| 228 | 228 | } |
@@ -257,16 +257,16 @@ discard block |
||
| 257 | 257 | { |
| 258 | 258 | $result = true; |
| 259 | 259 | try { |
| 260 | - if ( ! $this->unInstallDB($keepSettings)) { |
|
| 260 | + if (!$this->unInstallDB($keepSettings)) { |
|
| 261 | 261 | $this->messages[] = ' unInstallDB error'; |
| 262 | 262 | $result = false; |
| 263 | 263 | } |
| 264 | - if ($result && ! $this->unInstallFiles($keepSettings)) { |
|
| 264 | + if ($result && !$this->unInstallFiles($keepSettings)) { |
|
| 265 | 265 | $this->messages[] = ' unInstallFiles error'; |
| 266 | 266 | $result = false; |
| 267 | 267 | } |
| 268 | 268 | } catch (\Exception $exception) { |
| 269 | - $result = false; |
|
| 269 | + $result = false; |
|
| 270 | 270 | $this->messages[] = $exception->getMessage(); |
| 271 | 271 | } |
| 272 | 272 | |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | { |
| 315 | 315 | $cpPath = Util::which('cp'); |
| 316 | 316 | $rmPath = Util::which('rm'); |
| 317 | - $modulesDir = $this->config->path('core.modulesDir'); |
|
| 317 | + $modulesDir = $this->config->path('core.modulesDir'); |
|
| 318 | 318 | $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}"; |
| 319 | 319 | Util::mwExec("{$rmPath} -rf {$backupPath}"); |
| 320 | 320 | if ($keepSettings) { |
@@ -327,21 +327,21 @@ discard block |
||
| 327 | 327 | // IMG |
| 328 | 328 | $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache'); |
| 329 | 329 | $moduleImageCacheDir = "{$imgCacheDir}/{$this->moduleUniqueID}"; |
| 330 | - if (file_exists($moduleImageCacheDir)){ |
|
| 330 | + if (file_exists($moduleImageCacheDir)) { |
|
| 331 | 331 | unlink($moduleImageCacheDir); |
| 332 | 332 | } |
| 333 | 333 | |
| 334 | 334 | // CSS |
| 335 | 335 | $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache'); |
| 336 | 336 | $moduleCSSCacheDir = "{$cssCacheDir}/{$this->moduleUniqueID}"; |
| 337 | - if (file_exists($moduleCSSCacheDir)){ |
|
| 337 | + if (file_exists($moduleCSSCacheDir)) { |
|
| 338 | 338 | unlink($moduleCSSCacheDir); |
| 339 | 339 | } |
| 340 | 340 | |
| 341 | 341 | // JS |
| 342 | 342 | $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache'); |
| 343 | 343 | $moduleJSCacheDir = "{$jsCacheDir}/{$this->moduleUniqueID}"; |
| 344 | - if (file_exists($moduleJSCacheDir)){ |
|
| 344 | + if (file_exists($moduleJSCacheDir)) { |
|
| 345 | 345 | unlink($moduleJSCacheDir); |
| 346 | 346 | } |
| 347 | 347 | |
@@ -375,7 +375,7 @@ discard block |
||
| 375 | 375 | } |
| 376 | 376 | |
| 377 | 377 | $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID); |
| 378 | - if ( ! $module) { |
|
| 378 | + if (!$module) { |
|
| 379 | 379 | $module = new PbxExtensionModules(); |
| 380 | 380 | $module->name = $this->locString("Breadcrumb{$this->moduleUniqueID}"); |
| 381 | 381 | $module->disabled = '1'; |
@@ -401,7 +401,7 @@ discard block |
||
| 401 | 401 | $language = substr(PbxSettings::getValueByKey('WebAdminLanguage'), 0, 2); |
| 402 | 402 | $translates = []; |
| 403 | 403 | $extensionsTranslates = [[]]; |
| 404 | - $results = glob($this->moduleDir . '/{Messages}/en.php', GLOB_BRACE); |
|
| 404 | + $results = glob($this->moduleDir.'/{Messages}/en.php', GLOB_BRACE); |
|
| 405 | 405 | foreach ($results as $path) { |
| 406 | 406 | $langArr = require $path; |
| 407 | 407 | if (is_array($langArr)) { |
@@ -413,7 +413,7 @@ discard block |
||
| 413 | 413 | } |
| 414 | 414 | if ($language !== 'en') { |
| 415 | 415 | $additionalTranslates = [[]]; |
| 416 | - $results = glob($this->moduleDir . "/{Messages}/{$language}.php", GLOB_BRACE); |
|
| 416 | + $results = glob($this->moduleDir."/{Messages}/{$language}.php", GLOB_BRACE); |
|
| 417 | 417 | foreach ($results as $path) { |
| 418 | 418 | $langArr = require $path; |
| 419 | 419 | if (is_array($langArr)) { |
@@ -444,13 +444,13 @@ discard block |
||
| 444 | 444 | // Add new connection for this module after add new Models folder |
| 445 | 445 | RegisterDIServices::recreateModulesDBConnections(); |
| 446 | 446 | |
| 447 | - $results = glob($this->moduleDir . '/Models/*.php', GLOB_NOSORT); |
|
| 447 | + $results = glob($this->moduleDir.'/Models/*.php', GLOB_NOSORT); |
|
| 448 | 448 | $dbUpgrade = new UpdateDatabase(); |
| 449 | 449 | foreach ($results as $file) { |
| 450 | 450 | $className = pathinfo($file)['filename']; |
| 451 | 451 | $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}"; |
| 452 | 452 | $upgradeResult = $dbUpgrade->createUpdateDbTableByAnnotations($moduleModelClass); |
| 453 | - if (!$upgradeResult){ |
|
| 453 | + if (!$upgradeResult) { |
|
| 454 | 454 | return false; |
| 455 | 455 | } |
| 456 | 456 | |
@@ -476,7 +476,7 @@ discard block |
||
| 476 | 476 | $menuSettings = new PbxSettings(); |
| 477 | 477 | $menuSettings->key = $menuSettingsKey; |
| 478 | 478 | } |
| 479 | - $value = [ |
|
| 479 | + $value = [ |
|
| 480 | 480 | 'uniqid' => $this->moduleUniqueID, |
| 481 | 481 | 'href' => "/admin-cabinet/{$unCamelizedControllerName}", |
| 482 | 482 | 'group' => 'modules', |
@@ -377,13 +377,13 @@ discard block |
||
| 377 | 377 | $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID); |
| 378 | 378 | if ( ! $module) { |
| 379 | 379 | $module = new PbxExtensionModules(); |
| 380 | - $module->name = $this->locString("Breadcrumb{$this->moduleUniqueID}"); |
|
| 380 | + $module->name = $this->locString("breadcrumb{$this->moduleUniqueID}"); |
|
| 381 | 381 | $module->disabled = '1'; |
| 382 | 382 | } |
| 383 | 383 | $module->uniqid = $this->moduleUniqueID; |
| 384 | 384 | $module->developer = $this->developer; |
| 385 | 385 | $module->version = $this->version; |
| 386 | - $module->description = $this->locString("SubHeader{$this->moduleUniqueID}"); |
|
| 386 | + $module->description = $this->locString("subheader{$this->moduleUniqueID}"); |
|
| 387 | 387 | $module->support_email = $this->support_email; |
| 388 | 388 | |
| 389 | 389 | return $module->save(); |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | */ |
| 470 | 470 | public function addToSidebar(): bool |
| 471 | 471 | { |
| 472 | - $menuSettingsKey = "AdditionalMenuItem{$this->moduleUniqueID}"; |
|
| 472 | + $menuSettingsKey = "additionalmenuitem{$this->moduleUniqueID}"; |
|
| 473 | 473 | $unCamelizedControllerName = Text::uncamelize($this->moduleUniqueID, '-'); |
| 474 | 474 | $menuSettings = PbxSettings::findFirstByKey($menuSettingsKey); |
| 475 | 475 | if ($menuSettings === null) { |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | 'href' => "/admin-cabinet/{$unCamelizedControllerName}", |
| 482 | 482 | 'group' => 'modules', |
| 483 | 483 | 'iconClass' => 'puzzle', |
| 484 | - 'caption' => "Breadcrumb{$this->moduleUniqueID}", |
|
| 484 | + 'caption' => "breadcrumb{$this->moduleUniqueID}", |
|
| 485 | 485 | 'showAtSidebar' => true, |
| 486 | 486 | ]; |
| 487 | 487 | $menuSettings->value = json_encode($value); |