mikopbx / Core

src/Core/System/Upgrade/UpdateDatabase.php

Spacing +9 added lines, -9 removed lines

@@ -66,7 +66,7 @@ 
             $moduleModelClass = "MikoPBX\\Common\\Models\\{$className}";
             try {
                 $this->createUpdateDbTableByAnnotations($moduleModelClass);
-            } catch (Error $exception){
+            } catch (Error $exception) {
                 Util::echoWithSyslog('Errors within update table '.$className.' '.$exception->getMessage());
             }
         }
@@ -85,7 +85,7 @@ 
     {
         $result = true;
         if (
-            ! class_exists($modelClassName)
+            !class_exists($modelClassName)
             || count(get_class_vars($modelClassName)) === 0) {
             return true;
         }
@@ -125,7 +125,7 @@ 
                 'isNumeric' => false,
                 'primary'   => false,
             ];
-            $previousAttribute           = $attribute;
+            $previousAttribute = $attribute;
         }
 
         // Set data types
@@ -233,8 +233,8 @@ 
 
         $connectionService->begin();
 
-        if ( ! $connectionService->tableExists($tableName)) {
-            Util::echoWithSyslog(' - UpdateDatabase: Create new table: ' . $tableName . ' ');
+        if (!$connectionService->tableExists($tableName)) {
+            Util::echoWithSyslog(' - UpdateDatabase: Create new table: '.$tableName.' ');
             $result = $connectionService->createTable($tableName, '', $columnsNew);
             Util::echoGreenDone();
         } else {
@@ -242,7 +242,7 @@ 
             $currentColumnsArr = $connectionService->describeColumns($tableName, '');
 
             if ($this->isTableStructureNotEqual($currentColumnsArr, $columns)) {
-                Util::echoWithSyslog(' - UpdateDatabase: Upgrade table: ' . $tableName . ' ');
+                Util::echoWithSyslog(' - UpdateDatabase: Upgrade table: '.$tableName.' ');
                 // Create new table and copy all data
                 $currentStateColumnList = [];
                 $oldColNames            = []; // Старые названия колонок
@@ -332,13 +332,13 @@ 
                 if ($oldField->$compared_setting() !== $newField->$compared_setting()) {
                     // Sqlite transform "1" to ""1"" in default settings, but it is normal
                     if ($compared_setting === 'getDefault'
-                        && $oldField->$compared_setting() === '"' . $newField->$compared_setting() . '"') {
+                        && $oldField->$compared_setting() === '"'.$newField->$compared_setting().'"') {
                         continue;
                     }
 
                     // Description for "length" is integer, but table structure store it as string
                     if ($compared_setting === 'getSize'
-                        && (string)$oldField->$compared_setting() === (string)$newField->$compared_setting()) {
+                        && (string) $oldField->$compared_setting() === (string) $newField->$compared_setting()) {
                         continue;
                     }
 
@@ -366,7 +366,7 @@ 
         // Drop not exist indexes
         foreach ($currentIndexes as $indexName => $currentIndex) {
             if (stripos($indexName, 'sqlite_autoindex') === false
-                && ! array_key_exists($indexName, $indexes)
+                && !array_key_exists($indexName, $indexes)
             ) {
                 Util::echoWithSyslog(" - UpdateDatabase: Delete index: {$indexName} ");
                 $result = $result + $connectionService->dropIndex($tableName, '', $indexName);

src/PBXCoreREST/Workers/WorkerMakeLogFilesArchive.php

Spacing +2 added lines, -2 removed lines

@@ -19,12 +19,12 @@
     public function start($argv): void
     {
         $settings_file = trim($argv[1]);
-        if ( ! file_exists($settings_file)) {
+        if (!file_exists($settings_file)) {
             Util::sysLogMsg("WorkerMakeLogFilesArchive", 'File with settings not found');
             return;
         }
         $file_data = json_decode(file_get_contents($settings_file), true);
-        if ( ! isset($file_data['result_file'])) {
+        if (!isset($file_data['result_file'])) {
             Util::sysLogMsg("WorkerMakeLogFilesArchive", 'Wrong settings');
             return;
         }

src/Core/System/SentryErrorLogger.php

Spacing +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
             SentrySdk::init()->bindClient($client);
 
             SentrySdk::getCurrentHub()->configureScope(
-                function (Scope $scope): void {
+                function(Scope $scope): void {
                     if (isset($this->email)) {
                         $scope->setUser(['id' => $this->email], true);
                     }

src/AdminCabinet/Library/LanguageSelector.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         if (($list = strtolower($_SERVER['HTTP_ACCEPT_LANGUAGE']))) {
             if (preg_match_all('/([a-z]{1,8}(?:-[a-z]{1,8})?)(?:;q=([0-9.]+))?/', $list, $list)) {
                 $language = array_combine($list[1], $list[2]);
-                if (is_array($language)){
+                if (is_array($language)) {
                     foreach ($language as $n => $v) {
                         $this->language[$n] = $v ? $v : 1;
                     }

src/Core/Workers/WorkerLogRotate.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
     {
         $managedCache = $this->di->get('managedCache');
         $lastLogRotate = $managedCache->get('lastCoreWorkerLogRotateProcessing');
-        if ($lastLogRotate===null){
+        if ($lastLogRotate === null) {
             //System Logs
             NatsConf::logRotate();
             PHPConf::rotateLog();
@@ -49,15 +49,15 @@ 
      */
     public function logRotate(string $moduleUniqid): void
     {
-        $logPath        = System::getLogDir() . '/' . $moduleUniqid . '/';
-        if ( ! file_exists($logPath)) {
+        $logPath = System::getLogDir().'/'.$moduleUniqid.'/';
+        if (!file_exists($logPath)) {
             return;
         }
 
-        $results         = glob($logPath . '*.log', GLOB_NOSORT);
+        $results         = glob($logPath.'*.log', GLOB_NOSORT);
         $textConfig = '';
         foreach ($results as $file) {
-            $textConfig .= $file . ' {
+            $textConfig .= $file.' {
     start 0
     rotate 9
     size 10M

src/Core/System/Util.php

Braces +4 added lines, -3 removed lines

@@ -376,7 +376,7 @@ 
     {
         if($events === 'on'){
             $nameService = 'amiListner';
-        }else{
+        } else{
             $nameService = 'amiCommander';
         }
 
@@ -406,7 +406,7 @@ 
         for ($i = 0; $i < $length; $i++) {
             try {
                 $randomString .= $characters[random_int(0, $charactersLength - 1)];
-            }catch (\Exception $e ){
+            } catch (\Exception $e ){
                 $randomString = '';
             }
         }
@@ -991,7 +991,8 @@ 
      *
      * @return array
      */
-    public static function flattenArray(array $array) {
+    public static function flattenArray(array $array)
+    {
         $result = [];
         foreach ($array as $value) {
             if (is_array($value)) {

Indentation +23 added lines, -23 removed lines

@@ -262,32 +262,32 @@ 
 
         $WorkerPID = self::getPidOfProcess($proc_name);
 
-         switch ($action) {
-             case 'status':
+            switch ($action) {
+                case 'status':
                  $status = ($WorkerPID !== '') ? 'Started' : 'Stoped';
-                 return ['status' => $status, 'app' => $proc_name, 'PID' => $WorkerPID];
-             case 'restart':
+                    return ['status' => $status, 'app' => $proc_name, 'PID' => $WorkerPID];
+                case 'restart':
                  // Firstly start new process
                  self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
-                 // Then kill the old one
-                 if ($WorkerPID !== '') {
-                     self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
-                 }
-                 break;
-             case 'stop':
+                    // Then kill the old one
+                    if ($WorkerPID !== '') {
+                        self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
+                    }
+                    break;
+                case 'stop':
                  if ($WorkerPID !== '') {
-                     self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
-                 }
-                 break;
-             case 'start':
+                        self::mwExec("{$path_kill} -9 {$WorkerPID}  > /dev/null 2>&1 &");
+                    }
+                    break;
+                case 'start':
                  if ($WorkerPID === '') {
-                     self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
-                 }
-                 break;
-             case 'multiStart':
+                        self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
+                    }
+                    break;
+                case 'multiStart':
                  self::mwExec("{$path_nohup} {$cmd} {$param}  > {$out_file} 2>&1 &");
-                 break;
-             default:
+                    break;
+                default:
          }
 
         return true;
@@ -375,9 +375,9 @@ 
         $variable = "_IS_ORGNT={$IS_ORGNT},pt1c_cid={$dest_number},_extenfrom1c={$peer_number},__peer_mobile={$peer_mobile},_FROM_PEER={$peer_number}";
 
         return $am->Originate($channel,
-                              $dest_number,
-                              $context,
-                      '1', null, null, null, null, $variable, null, true);
+                                $dest_number,
+                                $context,
+                        '1', null, null, null, null, $variable, null, true);
     }
 
     /**

Spacing +31 added lines, -31 removed lines

@@ -44,7 +44,7 @@ 
             }
             if (is_array($value)) {
                 array_unshift($value, ' ');
-                $result_config .= trim(implode("\n{$key} = ", $value)) . "\n";
+                $result_config .= trim(implode("\n{$key} = ", $value))."\n";
             } else {
                 $result_config .= "{$key} = {$value}\n";
             }
@@ -64,7 +64,7 @@ 
     {
         $killallPath = self::which('killall');
 
-        return self::mwExec($killallPath . ' ' . escapeshellarg($procName));
+        return self::mwExec($killallPath.' '.escapeshellarg($procName));
     }
 
     /**
@@ -79,7 +79,7 @@ 
     public static function mwExec($command, &$outArr = null, &$retVal = null): int
     {
         $retVal = 0;
-        $outArr   = [];
+        $outArr = [];
         $di     = Di::getDefault();
 
         if ($di !== null && $di->getShared('config')->path('core.debugMode')) {
@@ -105,7 +105,7 @@ 
         $rmPath    = self::which('rm');
         $sleepPath = self::which('sleep');
         if ($sleep_time > 0) {
-            $filename = '/tmp/' . time() . '_noop.sh';
+            $filename = '/tmp/'.time().'_noop.sh';
             file_put_contents($filename, "{$sleepPath} {$sleep_time}; {$command}; {$rmPath} -rf {$filename}");
             $noop_command = "{$nohupPath} {$shPath} {$filename} > {$out_file} 2>&1 &";
         } else {
@@ -167,17 +167,17 @@ 
      *
      * @return bool
      */
-    public static function mwMkdir(string $parameters, bool $addWWWRights=false): bool
+    public static function mwMkdir(string $parameters, bool $addWWWRights = false): bool
     {
         $result = true;
         if (posix_getuid() === 0) {
             $arrPaths = explode(' ', $parameters);
             if (count($arrPaths) > 0) {
                 foreach ($arrPaths as $path) {
-                    if ( ! empty($path)
-                        && ! file_exists($path)
-                        && ! mkdir($path, 0755, true)
-                        && ! is_dir($path)) {
+                    if (!empty($path)
+                        && !file_exists($path)
+                        && !mkdir($path, 0755, true)
+                        && !is_dir($path)) {
                         $result = false;
                         self::sysLogMsg('Util', 'Error on create folder '.$path);
                     }
@@ -197,10 +197,10 @@ 
      * @param string $param
      * @param string $action
      */
-    public static function processPHPWorker(string $className, string $param = 'start', string $action='restart'): void
+    public static function processPHPWorker(string $className, string $param = 'start', string $action = 'restart'): void
     {
         $workerPath = self::getFilePathByClassName($className);
-        if ( ! empty($workerPath)) {
+        if (!empty($workerPath)) {
             $command = "php -f {$workerPath}";
             self::processWorker($command, $param, $className, $action);
         }
@@ -221,7 +221,7 @@ 
             $reflection = new ReflectionClass($className);
             $filename   = $reflection->getFileName();
         } catch (\ReflectionException $exception) {
-            self::sysLogMsg('Util', 'Error ' . $exception->getMessage());
+            self::sysLogMsg('Util', 'Error '.$exception->getMessage());
         }
 
         return $filename;
@@ -235,7 +235,7 @@ 
      * @param ?int $level
      * @param ?int $facility
      */
-    public static function sysLogMsg($log_name, $text, $level = null, $facility=LOG_AUTH): void
+    public static function sysLogMsg($log_name, $text, $level = null, $facility = LOG_AUTH): void
     {
         $level = ($level === null) ? LOG_WARNING : $level;
         openlog("$log_name", LOG_PID | LOG_PERROR, $facility);
@@ -346,8 +346,8 @@ 
 
         $name       = addslashes($name);
         $filter_cmd = '';
-        if ( ! empty($exclude)) {
-            $filter_cmd = "| $path_grep -v " . escapeshellarg($exclude);
+        if (!empty($exclude)) {
+            $filter_cmd = "| $path_grep -v ".escapeshellarg($exclude);
         }
         $out = [];
         self::mwExec(
@@ -369,7 +369,7 @@ 
     public static function amiOriginate($peer_number, $peer_mobile, $dest_number): array
     {
         $am       = self::getAstManager('off');
-        $channel  = 'Local/' . $peer_number . '@internal-originate';
+        $channel  = 'Local/'.$peer_number.'@internal-originate';
         $context  = 'all_peers';
         $IS_ORGNT = self::generateRandomString();
         $variable = "_IS_ORGNT={$IS_ORGNT},pt1c_cid={$dest_number},_extenfrom1c={$peer_number},__peer_mobile={$peer_mobile},_FROM_PEER={$peer_number}";
@@ -389,9 +389,9 @@ 
      */
     public static function getAstManager($events = 'on'): AsteriskManager
     {
-        if($events === 'on'){
+        if ($events === 'on') {
             $nameService = 'amiListner';
-        }else{
+        } else {
             $nameService = 'amiCommander';
         }
 
@@ -417,7 +417,7 @@ 
         for ($i = 0; $i < $length; $i++) {
             try {
                 $randomString .= $characters[random_int(0, $charactersLength - 1)];
-            }catch (\Exception $e ){
+            } catch (\Exception $e) {
                 $randomString = '';
             }
         }
@@ -597,7 +597,7 @@ 
     public static function getExtensionOfFile($filename)
     {
         $path_parts = pathinfo($filename);
-        return $path_parts['extension']??'';
+        return $path_parts['extension'] ?? '';
     }
 
     /**
@@ -611,10 +611,10 @@ 
     public static function trimExtensionForFile($filename, $delimiter = '.'): string
     {
         // Отсечем расширение файла.
-        $tmp_arr = explode((string)$delimiter, $filename);
+        $tmp_arr = explode((string) $delimiter, $filename);
         if (count($tmp_arr) > 1) {
             unset($tmp_arr[count($tmp_arr) - 1]);
-            $filename = implode((string)$delimiter, $tmp_arr);
+            $filename = implode((string) $delimiter, $tmp_arr);
         }
 
         return $filename;
@@ -686,14 +686,14 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::rRmDir($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::rRmDir($dir."/".$object);
                     } else {
-                        unlink($dir . "/" . $object);
+                        unlink($dir."/".$object);
                     }
                 }
             }
-            if($objects !== false){
+            if ($objects !== false) {
                 reset($objects);
             }
             rmdir($dir);
@@ -712,7 +712,7 @@ 
     public static function generateSslCert($options = null, $config_args_pkey = null, $config_args_csr = null): array
     {
         // Инициализация настроек.
-        if ( ! $options) {
+        if (!$options) {
             $options = [
                 "countryName"            => 'RU',
                 "stateOrProvinceName"    => 'Moscow',
@@ -724,11 +724,11 @@ 
             ];
         }
 
-        if ( ! $config_args_csr) {
+        if (!$config_args_csr) {
             $config_args_csr = ['digest_alg' => 'sha256'];
         }
 
-        if ( ! $config_args_pkey) {
+        if (!$config_args_pkey) {
             $config_args_pkey = [
                 "private_key_bits" => 2048,
                 "private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -874,7 +874,7 @@ 
             $row = trim($row);
             $pos = strpos($row, ']');
             if ($pos !== false && strpos($row, '[') === 0) {
-                $row = "\n" . substr($row, 0, $pos);
+                $row = "\n".substr($row, 0, $pos);
             }
         }
         unset($row);
@@ -886,7 +886,7 @@ 
         foreach ($sections as $section) {
             $data_rows    = explode("\n", trim($section));
             $section_name = trim($data_rows[0] ?? '');
-            if ( ! empty($section_name)) {
+            if (!empty($section_name)) {
                 unset($data_rows[0]);
                 $manual_data[$section_name] = [];
                 foreach ($data_rows as $row) {

src/AdminCabinet/Forms/SystemDiagnosticForm.php

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
         $this->add($filenames);
 
         $this->add(new Text('filter', ['value' => '']));
-        $this->add(new Numeric('lines',  ['value' => '500']));
-        $this->add(new Numeric('offset',  ['value' => '0']));
+        $this->add(new Numeric('lines', ['value' => '500']));
+        $this->add(new Numeric('offset', ['value' => '0']));
 
     }
 }
\ No newline at end of file

src/AdminCabinet/Controllers/ExtensionsController.php

Indentation +5 added lines, -5 removed lines

@@ -215,11 +215,11 @@
 
         $form = new ExtensionEditForm(
             $extension, [
-                          'network_filters'        => $arrNetworkFilters,
-                          'external_extension'     => $externalExtension,
-                          'forwarding_extensions'  => $forwardingExtensions,
-                          'internalextension_mask' => $internalExtensionMask,
-                      ]
+                            'network_filters'        => $arrNetworkFilters,
+                            'external_extension'     => $externalExtension,
+                            'forwarding_extensions'  => $forwardingExtensions,
+                            'internalextension_mask' => $internalExtensionMask,
+                        ]
         );
 
         $this->view->form      = $form;

Spacing +41 added lines, -41 removed lines

@@ -80,14 +80,14 @@ 
                     $extensionTable[$extension->userid]['email']    = $extension->email;
                     $extensionTable[$extension->userid]['secret']   = $extension->secret;
 
-                    if ( ! array_key_exists('mobile', $extensionTable[$extension->userid])) {
+                    if (!array_key_exists('mobile', $extensionTable[$extension->userid])) {
                         $extensionTable[$extension->userid]['mobile'] = '';
                     }
                     if ($extension->avatar) {
                         $filename    = md5($extension->avatar);
                         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
                         $imgFile     = "{$imgCacheDir}/$filename.jpg";
-                        if ( ! file_exists($imgFile)) {
+                        if (!file_exists($imgFile)) {
                             $this->base64ToJpeg($extension->avatar, $imgFile);
                         }
 
@@ -152,7 +152,7 @@ 
             $extension->Sip                    = new Sip();
             $extension->Sip->disabled          = 0;
             $extension->Sip->type              = 'peer';
-            $extension->Sip->uniqid            = Extensions::TYPE_SIP.strtoupper('-PHONE-' . md5(time()));
+            $extension->Sip->uniqid            = Extensions::TYPE_SIP.strtoupper('-PHONE-'.md5(time()));
             $extension->Sip->busylevel         = 1;
             $extension->Sip->qualify           = '1';
             $extension->Sip->qualifyfreq       = 60;
@@ -174,7 +174,7 @@ 
             $arrNetworkFilters[$filter->id] = $filter->getRepresent();
         }
 
-        $parameters        = [
+        $parameters = [
             'conditions' => 'type = "'.Extensions::TYPE_EXTERNAL.'" AND is_general_user_number = "1" AND userid=:userid:',
             'bind'       => [
                 'userid' => $extension->userid,
@@ -187,11 +187,11 @@ 
             $externalExtension->type                     = Extensions::TYPE_EXTERNAL;
             $externalExtension->is_general_user_number   = '1';
             $externalExtension->ExternalPhones           = new ExternalPhones();
-            $externalExtension->ExternalPhones->uniqid   = Extensions::TYPE_EXTERNAL.strtoupper('-' . md5(time()));
+            $externalExtension->ExternalPhones->uniqid   = Extensions::TYPE_EXTERNAL.strtoupper('-'.md5(time()));
             $externalExtension->ExternalPhones->disabled = '0';
         }
 
-        $forwardingExtensions  = [];
+        $forwardingExtensions = [];
         $forwardingExtensions[''] = $this->translation->_('ex_SelectNumber');
 
         $parameters = [
@@ -235,11 +235,11 @@ 
             'conditions' => 'type = "'.Extensions::TYPE_SIP.'"',
             'column'     => 'number',
         ];
-        $query      = Extensions::maximum($parameters);
+        $query = Extensions::maximum($parameters);
         if ($query === null) {
             $query = 200;
         }
-        $result       = (int)$query + 1;
+        $result       = (int) $query + 1;
         $extensionsLength = PbxSettings::getValueByKey('PBXInternalExtensionLength');
         $maxExtension = (10 ** $extensionsLength) - 1;
 
@@ -253,7 +253,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -275,21 +275,21 @@ 
             $fwdEntity->ringlength = 45;
         } else {
             $extension = $sipEntity->Extensions;
-            if ( ! $extension) {
+            if (!$extension) {
                 $extension = new Extensions();
             }
             $userEntity = $extension->Users;
-            if ( ! $userEntity) {
+            if (!$userEntity) {
                 $userEntity = new Users();
             }
             $fwdEntity = $extension->ExtensionForwardingRights;
-            if ( ! $fwdEntity) {
+            if (!$fwdEntity) {
                 $fwdEntity = new ExtensionForwardingRights();
             }
         }
 
         // Заполним параметры пользователя
-        if ( ! $this->saveUser($userEntity, $data)) {
+        if (!$this->saveUser($userEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -297,7 +297,7 @@ 
         }
 
         // Заполним параметры внутреннего номера
-        if ( ! $this->saveExtension($extension, $userEntity, $data, false)) {
+        if (!$this->saveExtension($extension, $userEntity, $data, false)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -305,7 +305,7 @@ 
         }
 
         // Заполним параметры SIP учетки
-        if ( ! $this->saveSip($sipEntity, $data)) {
+        if (!$this->saveSip($sipEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -314,7 +314,7 @@ 
 
 
         // Заполним параметры маршрутизации
-        if ( ! $this->saveForwardingRights($fwdEntity, $data)) {
+        if (!$this->saveForwardingRights($fwdEntity, $data)) {
             $this->view->success = false;
             $this->db->rollback();
 
@@ -322,7 +322,7 @@ 
         }
 
         // Если мобильный не указан, то не будем его добавлять в базу
-        if ( ! empty($data['mobile_number'])) {
+        if (!empty($data['mobile_number'])) {
             $externalPhone = ExternalPhones::findFirstByUniqid($data['mobile_uniqid']);
             if ($externalPhone === null) {
                 $externalPhone   = new ExternalPhones();
@@ -332,7 +332,7 @@ 
             }
 
             // Заполним параметры Extension для мобильного
-            if ( ! $this->saveExtension($mobileExtension, $userEntity, $data, true)) {
+            if (!$this->saveExtension($mobileExtension, $userEntity, $data, true)) {
                 $this->view->success = false;
                 $this->db->rollback();
 
@@ -340,7 +340,7 @@ 
             }
 
             // Заполним параметры ExternalPhones для мобильного
-            if ( ! $this->saveExternalPhones($externalPhone, $data)) {
+            if (!$this->saveExternalPhones($externalPhone, $data)) {
                 $this->view->success = false;
                 $this->db->rollback();
 
@@ -348,7 +348,7 @@ 
             }
         } else {
             // Удалить номер мобильного если он был привязан к пользователю
-            $parameters          = [
+            $parameters = [
                 'conditions' => 'type="'.Extensions::TYPE_EXTERNAL.'" AND is_general_user_number = "1" AND userid=:userid:',
                 'bind'       => [
                     'userid' => $userEntity->id,
@@ -390,13 +390,13 @@ 
         foreach ($userEntity as $name => $value) {
             switch ($name) {
                 case 'role':
-                    if (array_key_exists('user_' . $name, $data)) {
-                        $userEntity->$name = ($userEntity->$name === 'user') ? 'user' : $data['user_' . $name]; // не повышаем роль
+                    if (array_key_exists('user_'.$name, $data)) {
+                        $userEntity->$name = ($userEntity->$name === 'user') ? 'user' : $data['user_'.$name]; // не повышаем роль
                     }
                     break;
                 default:
-                    if (array_key_exists('user_' . $name, $data)) {
-                        $userEntity->$name = $data['user_' . $name];
+                    if (array_key_exists('user_'.$name, $data)) {
+                        $userEntity->$name = $data['user_'.$name];
                     }
             }
         }
@@ -488,20 +488,20 @@ 
                     break;
                 case 'disabled':
                 case 'disablefromuser':
-                    if (array_key_exists('sip_' . $name, $data)) {
-                        $sipEntity->$name = ($data['sip_' . $name] === 'on') ? '1' : '0';
+                    if (array_key_exists('sip_'.$name, $data)) {
+                        $sipEntity->$name = ($data['sip_'.$name] === 'on') ? '1' : '0';
                     } else {
                         $sipEntity->$name = "0";
                     }
                     break;
                 case 'networkfilterid':
-                    if ( ! array_key_exists('sip_' . $name, $data)) {
+                    if (!array_key_exists('sip_'.$name, $data)) {
                         continue 2;
                     }
-                    if ($data['sip_' . $name] === 'none') {
+                    if ($data['sip_'.$name] === 'none') {
                         $sipEntity->$name = null;
                     } else {
-                        $sipEntity->$name = $data['sip_' . $name];
+                        $sipEntity->$name = $data['sip_'.$name];
                     }
                     break;
                 case 'extension':
@@ -514,8 +514,8 @@ 
                     $sipEntity->setManualAttributes($data['sip_manualattributes']);
                     break;
                 default:
-                    if (array_key_exists('sip_' . $name, $data)) {
-                        $sipEntity->$name = $data['sip_' . $name];
+                    if (array_key_exists('sip_'.$name, $data)) {
+                        $sipEntity->$name = $data['sip_'.$name];
                     }
             }
         }
@@ -545,8 +545,8 @@ 
                     $forwardingRight->$name = $data['number'];
                     break;
                 default:
-                    if (array_key_exists('fwd_' . $name, $data)) {
-                        $forwardingRight->$name = ($data['fwd_' . $name] === -1) ? '' : $data['fwd_' . $name];
+                    if (array_key_exists('fwd_'.$name, $data)) {
+                        $forwardingRight->$name = ($data['fwd_'.$name] === -1) ? '' : $data['fwd_'.$name];
                     }
             }
         }
@@ -583,15 +583,15 @@ 
                     $externalPhone->$name = $data['user_username'];
                     break;
                 case 'disabled':
-                    if (array_key_exists('mobile_' . $name, $data)) {
-                        $externalPhone->$name = ($data['mobile_' . $name] === 'on') ? '1' : '0';
+                    if (array_key_exists('mobile_'.$name, $data)) {
+                        $externalPhone->$name = ($data['mobile_'.$name] === 'on') ? '1' : '0';
                     } else {
                         $externalPhone->$name = '0';
                     }
                     break;
                 default:
-                    if (array_key_exists('mobile_' . $name, $data)) {
-                        $externalPhone->$name = $data['mobile_' . $name];
+                    if (array_key_exists('mobile_'.$name, $data)) {
+                        $externalPhone->$name = $data['mobile_'.$name];
                     }
             }
         }
@@ -620,13 +620,13 @@ 
 
         $errors = null;
         if ($extension !== null && $extension->ExtensionForwardingRights
-            && ! $extension->ExtensionForwardingRights->delete()) {
+            && !$extension->ExtensionForwardingRights->delete()) {
             $errors = $extension->ExtensionForwardingRights->getMessages();
         }
 
-        if ( ! $errors && $extension) {
+        if (!$errors && $extension) {
             $user = $extension->Users;
-            if ( ! $user->delete()) {
+            if (!$user->delete()) {
                 $errors = $user->getMessages();
             }
         }
@@ -746,7 +746,7 @@ 
      */
     public function GetPhonesRepresentAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $numbers = $this->request->getPost('numbers');

src/Core/Asterisk/Configs/ModulesConf.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 
     protected function generateConfigProtected(): void
     {
-        $conf = "[modules]\n" .
+        $conf = "[modules]\n".
             "autoload=no\n";
 
         $modules = [
@@ -178,7 +178,7 @@ 
             $conf .= $appClass->generateModulesConf();
         }
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/modules.conf', $conf);
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/codecs.conf', '');
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/modules.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/codecs.conf', '');
     }
 }
\ No newline at end of file