mikopbx / Core

src/PBXCoreREST/Controllers/Modules/ModulesControllerBase.php

Spacing +3 added lines, -3 removed lines

@@ -47,18 +47,18 @@
         $request            = json_encode([
             'data'           => $_REQUEST,
             'module'         => $moduleName,
-            'input'          => $input,     // Параметры запроса.
+            'input'          => $input, // Параметры запроса.
             'action'         => $actionName,
             'REQUEST_METHOD' => $_SERVER['REQUEST_METHOD'],
             'processor'      => 'modules',
         ]);
 
-        $response   = $this->di->getShared('beanstalkConnectionWorkerAPI')->request($request, 30, 0);
+        $response = $this->di->getShared('beanstalkConnectionWorkerAPI')->request($request, 30, 0);
         if ($response !== false) {
             $response = json_decode($response, true);
             if (isset($response['fpassthru'])) {
                 $fp = fopen($response['filename'], "rb");
-                if ($fp!==false) {
+                if ($fp !== false) {
                     $size = filesize($response['filename']);
                     $name = basename($response['filename']);
                     $this->response->setHeader('Content-Description', "config file");

src/PBXCoreREST/Controllers/BaseController.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
         string $processor,
         string $actionName,
         $payload = null,
-        string $modulename='',
+        string $modulename = '',
         int $maxTimeout = 10,
         int $priority = Pheanstalk::DEFAULT_PRIORITY
     ): void
@@ -37,12 +37,12 @@ 
             'data'      => $payload,
             'action'    => $actionName
         ];
-        if ($processor==='modules'){
+        if ($processor === 'modules') {
             $requestMessage['module'] = $modulename;
         }
         try {
             $message = json_encode($requestMessage, JSON_THROW_ON_ERROR);
-            $response       = $this->di->getShared('beanstalkConnectionWorkerAPI')->request($message, $maxTimeout, $priority);
+            $response = $this->di->getShared('beanstalkConnectionWorkerAPI')->request($message, $maxTimeout, $priority);
             if ($response !== false) {
                 $response = json_decode($response, true, 512, JSON_THROW_ON_ERROR);
                 $this->response->setPayloadSuccess($response);
@@ -64,7 +64,7 @@ 
     {
         $this
             ->response
-            ->setPayloadError($this->response->getHttpCodeDescription($code) . ' ' . $description)
+            ->setPayloadError($this->response->getHttpCodeDescription($code).' '.$description)
             ->setStatusCode($code);
     }
 }
\ No newline at end of file

src/Modules/Setup/PbxExtensionSetupBase.php

Spacing +22 added lines, -22 removed lines

@@ -116,8 +116,8 @@ 
         $this->messages = [];
         $this->db      = $this->getDI()->getShared('db');
         $this->config  = $this->getDI()->getShared('config');
-        $this->license =  $this->getDI()->getShared('license');
-        $this->moduleDir = $this->config->path('core.modulesDir') . '/' . $this->moduleUniqueID;
+        $this->license = $this->getDI()->getShared('license');
+        $this->moduleDir = $this->config->path('core.modulesDir').'/'.$this->moduleUniqueID;
         $settings_file = "{$this->moduleDir}/module.json";
         if (file_exists($settings_file)) {
             $module_settings = json_decode(file_get_contents($settings_file), true);
@@ -141,7 +141,7 @@ 
             }
         }
 
-        $this->messages  = [];
+        $this->messages = [];
 
 
     }
@@ -156,21 +156,21 @@ 
     {
         $result = true;
         try {
-            if ( ! $this->activateLicense()) {
+            if (!$this->activateLicense()) {
                 $this->messages[] = 'License activate error';
                 $result           = false;
             }
-            if ( ! $this->installFiles()) {
+            if (!$this->installFiles()) {
                 $this->messages[] = ' installFiles error';
                 $result           = false;
             }
-            if ( ! $this->installDB()) {
+            if (!$this->installDB()) {
                 $this->messages[] = ' installDB error';
                 $result           = false;
             }
             $this->fixFilesRights();
         } catch (Throwable $exception) {
-            $result         = false;
+            $result = false;
             $this->messages[] = $exception->getMessage();
         }
 
@@ -201,7 +201,7 @@ 
         PbxExtensionUtils::createAgiBinSymlinks($this->moduleUniqueID);
 
         // Restore database settings
-        $modulesDir          = $this->config->path('core.modulesDir');
+        $modulesDir = $this->config->path('core.modulesDir');
         $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}";
         if (is_dir($backupPath)) {
             $cpPath = Util::which('cp');
@@ -224,7 +224,7 @@ 
             "{$this->moduleDir}/bin"
         ];
         foreach ($dirs as $dir) {
-            if(file_exists($dir) && is_dir($dir)){
+            if (file_exists($dir) && is_dir($dir)) {
                 // Add executable right to module's binary
                 Util::addExecutableRights($dir);
             }
@@ -259,16 +259,16 @@ 
     {
         $result = true;
         try {
-            if ( ! $this->unInstallDB($keepSettings)) {
+            if (!$this->unInstallDB($keepSettings)) {
                 $this->messages[] = ' unInstallDB error';
                 $result           = false;
             }
-            if ($result && ! $this->unInstallFiles($keepSettings)) {
+            if ($result && !$this->unInstallFiles($keepSettings)) {
                 $this->messages[] = ' unInstallFiles error';
                 $result           = false;
             }
         } catch (Throwable $exception) {
-            $result         = false;
+            $result = false;
             $this->messages[] = $exception->getMessage();
         }
 
@@ -316,7 +316,7 @@ 
     {
         $cpPath = Util::which('cp');
         $rmPath = Util::which('rm');
-        $modulesDir          = $this->config->path('core.modulesDir');
+        $modulesDir = $this->config->path('core.modulesDir');
         $backupPath = "{$modulesDir}/Backup/{$this->moduleUniqueID}";
         Processes::mwExec("{$rmPath} -rf {$backupPath}");
         if ($keepSettings) {
@@ -329,21 +329,21 @@ 
         // IMG
         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
         $moduleImageCacheDir = "{$imgCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleImageCacheDir)){
+        if (file_exists($moduleImageCacheDir)) {
             unlink($moduleImageCacheDir);
         }
 
         // CSS
         $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache');
         $moduleCSSCacheDir = "{$cssCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleCSSCacheDir)){
+        if (file_exists($moduleCSSCacheDir)) {
             unlink($moduleCSSCacheDir);
         }
 
         // JS
         $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache');
         $moduleJSCacheDir = "{$jsCacheDir}/{$this->moduleUniqueID}";
-        if (file_exists($moduleJSCacheDir)){
+        if (file_exists($moduleJSCacheDir)) {
             unlink($moduleJSCacheDir);
         }
 
@@ -377,7 +377,7 @@ 
         }
 
         $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID);
-        if ( ! $module) {
+        if (!$module) {
             $module           = new PbxExtensionModules();
             $module->name     = $this->locString("Breadcrumb{$this->moduleUniqueID}");
             $module->disabled = '1';
@@ -403,7 +403,7 @@ 
         $language             = substr(PbxSettings::getValueByKey('WebAdminLanguage'), 0, 2);
         $translates           = [];
         $extensionsTranslates = [[]];
-        $results              = glob($this->moduleDir . '/{Messages}/en.php', GLOB_BRACE);
+        $results              = glob($this->moduleDir.'/{Messages}/en.php', GLOB_BRACE);
         foreach ($results as $path) {
             $langArr = require $path;
             if (is_array($langArr)) {
@@ -415,7 +415,7 @@ 
         }
         if ($language !== 'en') {
             $additionalTranslates = [[]];
-            $results              = glob($this->moduleDir . "/{Messages}/{$language}.php", GLOB_BRACE);
+            $results              = glob($this->moduleDir."/{Messages}/{$language}.php", GLOB_BRACE);
             foreach ($results as $path) {
                 $langArr = require $path;
                 if (is_array($langArr)) {
@@ -446,13 +446,13 @@ 
         // Add new connection for this module after add new Models folder
         RegisterDIServices::recreateModulesDBConnections();
 
-        $results = glob($this->moduleDir . '/Models/*.php', GLOB_NOSORT);
+        $results = glob($this->moduleDir.'/Models/*.php', GLOB_NOSORT);
         $dbUpgrade = new UpdateDatabase();
         foreach ($results as $file) {
             $className        = pathinfo($file)['filename'];
             $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}";
             $upgradeResult = $dbUpgrade->createUpdateDbTableByAnnotations($moduleModelClass);
-            if (!$upgradeResult){
+            if (!$upgradeResult) {
                 return false;
             }
 
@@ -478,7 +478,7 @@ 
             $menuSettings      = new PbxSettings();
             $menuSettings->key = $menuSettingsKey;
         }
-        $value               = [
+        $value = [
             'uniqid'        => $this->moduleUniqueID,
             'href'          => "/admin-cabinet/{$unCamelizedControllerName}",
             'group'         => 'modules',

src/Common/Providers/ModulesDBConnectionsProvider.php

Spacing +11 added lines, -11 removed lines

@@ -40,21 +40,21 @@ 
         $config               = $di->getShared('config');
         $modulesDir           = $config->path('core.modulesDir');
 
-        $results = glob($modulesDir . '/*/module.json', GLOB_NOSORT);
+        $results = glob($modulesDir.'/*/module.json', GLOB_NOSORT);
 
         foreach ($results as $moduleJson) {
-            $jsonString            = file_get_contents($moduleJson);
-            if ($jsonString === false){
+            $jsonString = file_get_contents($moduleJson);
+            if ($jsonString === false) {
                 continue;
             }
             $jsonModuleDescription = json_decode($jsonString, true);
-            if ( ! is_array($jsonModuleDescription)
+            if (!is_array($jsonModuleDescription)
                 || !array_key_exists('moduleUniqueID', $jsonModuleDescription)) {
                 continue;
             }
 
             $moduleUniqueId = $jsonModuleDescription['moduleUniqueID'];
-            if ( ! isset($moduleUniqueId)) {
+            if (!isset($moduleUniqueId)) {
                 continue;
             }
 
@@ -74,14 +74,14 @@ 
                 }
 
                 if (
-                    ! class_exists($moduleModelClass)
+                    !class_exists($moduleModelClass)
                     || count(get_class_vars($moduleModelClass)) === 0) {
                     continue;
                 }
 
                 $model                 = new $moduleModelClass();
                 $connectionServiceName = $model->getReadConnectionService();
-                if ( ! isset($connectionServiceName)) {
+                if (!isset($connectionServiceName)) {
                     continue;
                 }
                 $registeredDBServices[] = $connectionServiceName;
@@ -91,7 +91,7 @@ 
 
                 // Create and connect database
                 $dbDir = "{$config->path('core.modulesDir')}/{$moduleUniqueId}/db";
-                if (!file_exists($dbDir)){
+                if (!file_exists($dbDir)) {
                     Util::mwMkdir($dbDir, true);
                 }
                 $dbFileName = "{$dbDir}/module.db";
@@ -100,7 +100,7 @@ 
                 // Log
                 $logDir = "{$config->path('core.logsDir')}/$moduleUniqueId/db";
                 $logFileName = "{$logDir}/queries.log";
-                if (!is_dir($logDir)){
+                if (!is_dir($logDir)) {
                     Util::mwMkdir($logDir, true);
                     $touchPath = Util::which('touch');
                     Processes::mwExec("{$touchPath} {$logFileName}");
@@ -117,7 +117,7 @@ 
                 $this->registerDBService($connectionServiceName, $di, $params);
 
                 // if database was created, we have to apply rules
-                if (!$dbFileExistBeforeAttachToConnection){
+                if (!$dbFileExistBeforeAttachToConnection) {
                     Util::addRegularWWWRights($dbDir);
                 }
             }
@@ -133,7 +133,7 @@ 
         // Attach all created connections to one transaction manager
         $eventsManager->attach(
             'db',
-            function ($event) use ($registeredDBServices, $di) {
+            function($event) use ($registeredDBServices, $di) {
                 switch ($event->getType()) {
                     case 'beginTransaction':
                     {

src/PBXCoreREST/Workers/WorkerApiCommands.php

Indentation +5 added lines, -5 removed lines

@@ -143,11 +143,11 @@
     {
         return [
             'system'  => [
-                 'enableModule',
-                 'disableModule',
-                 'uninstallModule',
-                 'installNewModule',
-                 'restoreDefaultSettings',
+                    'enableModule',
+                    'disableModule',
+                    'uninstallModule',
+                    'installNewModule',
+                    'restoreDefaultSettings',
             ],
         ];
     }

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
         while ($this->needRestart === false) {
             $beanstalk->wait();
         }
-        if ($this->needRestart){
+        if ($this->needRestart) {
             Processes::restartAllWorkers();
         }
     }
@@ -102,8 +102,8 @@ 
                 $res->messages[] = "Unknown processor - {$processor} in prepareAnswer";
             }
         } catch (Throwable $exception) {
-            $res->messages[] = 'Exception on WorkerApiCommands - ' . $exception->getMessage();
-            $request        = [];
+            $res->messages[] = 'Exception on WorkerApiCommands - '.$exception->getMessage();
+            $request = [];
         } finally {
             $message->reply(json_encode($res->getResult()));
             if ($res->success) {

src/Core/Asterisk/Configs/AsteriskConf.php

Spacing +20 added lines, -20 removed lines

@@ -21,27 +21,27 @@
 
         $lang = $this->generalSettings['PBXLanguage'];
 
-        $conf = "[directories]\n" .
-            "astetcdir => {$this->config->path('asterisk.astetcdir')}\n" .
-            "astagidir => {$this->config->path('asterisk.astagidir')}\n" .
-            "astkeydir => /etc/asterisk\n" .
-            "astrundir => /var/asterisk/run\n" .
-            "astmoddir => {$this->config->path('asterisk.astmoddir')}\n" .
-            "astvarlibdir => {$this->config->path('asterisk.astvarlibdir')}\n" .
-            "astdbdir => {$this->config->path('asterisk.astdbdir')}\n" .
-            "astlogdir => {$this->config->path('asterisk.astlogdir')}\n" .
-            "astspooldir => {$this->config->path('asterisk.astspooldir')}\n" .
-            "\n" .
-            "\n" .
-            "[options]\n" .
-            "verbose = 0\n" .
-            "debug = 0\n" .
-            "dumpcore = no\n" .
-            "transcode_via_sln = no\n" .
-            "hideconnect = yes\n" .
-            "defaultlanguage = {$lang}\n" .
+        $conf = "[directories]\n".
+            "astetcdir => {$this->config->path('asterisk.astetcdir')}\n".
+            "astagidir => {$this->config->path('asterisk.astagidir')}\n".
+            "astkeydir => /etc/asterisk\n".
+            "astrundir => /var/asterisk/run\n".
+            "astmoddir => {$this->config->path('asterisk.astmoddir')}\n".
+            "astvarlibdir => {$this->config->path('asterisk.astvarlibdir')}\n".
+            "astdbdir => {$this->config->path('asterisk.astdbdir')}\n".
+            "astlogdir => {$this->config->path('asterisk.astlogdir')}\n".
+            "astspooldir => {$this->config->path('asterisk.astspooldir')}\n".
+            "\n".
+            "\n".
+            "[options]\n".
+            "verbose = 0\n".
+            "debug = 0\n".
+            "dumpcore = no\n".
+            "transcode_via_sln = no\n".
+            "hideconnect = yes\n".
+            "defaultlanguage = {$lang}\n".
             "systemname = mikopbx\n";
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/asterisk.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/asterisk.conf', $conf);
     }
 }
\ No newline at end of file

src/PBXCoreREST/Workers/WorkerLongPoolAPI.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
             $this->setChannelsData();
             if (is_array($data) && isset($data['infos'])) {
                 foreach ($data['infos'] as $channel_data) {
-                    $url = 'http://localhost/pbxcore/api/long/pub?id=' . $channel_data['channel'];
+                    $url = 'http://localhost/pbxcore/api/long/pub?id='.$channel_data['channel'];
 
                     $data_for_send = $this->execFunction($channel_data['channel']);
                     if ($data_for_send) {
@@ -55,7 +55,7 @@ 
                         $this->postData($url, "$data_for_send\n");
                     }
 
-                    if ( ! isset($COMMON_CNANNELS[$channel_data['channel']])) {
+                    if (!isset($COMMON_CNANNELS[$channel_data['channel']])) {
                         continue;
                     }
 
@@ -132,7 +132,7 @@ 
     private function execFunction($channel, $common_chan = null)
     {
         clearstatcache();
-        if ( ! $this->checkAction($channel, $common_chan)) {
+        if (!$this->checkAction($channel, $common_chan)) {
             return '';
         }
         $data_for_send = null;
@@ -163,18 +163,18 @@ 
      */
     private function checkAction($channel, $common_chan = null)
     {
-        if ( ! $common_chan) {
+        if (!$common_chan) {
             $actions = $GLOBALS['ACTIONS'];
         } else {
             $actions = $GLOBALS['COMMON_CNANNELS'][$common_chan];
         }
 
         $enable = false;
-        if ( ! $actions) {
+        if (!$actions) {
             return $enable;
         }
         // $data = null;
-        $now  = time();
+        $now = time();
 
         $action_data = $actions[$channel] ?? null;
         if ($action_data !== null) {

src/Core/Workers/WorkerAmiListener.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
      */
     public function callback($parameters): void
     {
-        if ($this->replyOnPingRequest($parameters)){
+        if ($this->replyOnPingRequest($parameters)) {
            return;
         }
 
@@ -100,7 +100,7 @@ 
         }
 
         if ($message_is_sent === false) {
-            Util::sysLogMsg('CDR_AMI_Connector', "Error send data to queue. " . $error);
+            Util::sysLogMsg('CDR_AMI_Connector', "Error send data to queue. ".$error);
         }
         // Логируем оповещение.
         Util::logMsgDb('WorkerCallEvents::class', json_decode($result, true));

src/Core/Workers/WorkerNotifyByEmail.php

Spacing +3 added lines, -3 removed lines

@@ -49,7 +49,7 @@ 
         $tmpArray = [];
         foreach ($data as $call) {
             $keyHash = $call['email'].$call['start'].$call['from_number'].$call['to_number'];
-            if(in_array($keyHash, $tmpArray, true)){
+            if (in_array($keyHash, $tmpArray, true)) {
                 continue;
             }
             $tmpArray[] = $keyHash;
@@ -57,7 +57,7 @@ 
              * 'language'
              * 'is_internal'
              */
-            if ( ! isset($emails[$call['email']])) {
+            if (!isset($emails[$call['email']])) {
                 $emails[$call['email']] = '';
             }
 
@@ -107,7 +107,7 @@ 
 
 // Start worker process
 $workerClassname = WorkerNotifyByEmail::class;
-$action = $argv[1]??'';
+$action = $argv[1] ?? '';
 if ($action === 'start') {
     cli_set_process_title($workerClassname);
     while (true) {