mikopbx / Core

src/Modules/Setup/PbxExtensionSetupBase.php

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -377,13 +377,13 @@ 
         $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID);
         if ( ! $module) {
             $module           = new PbxExtensionModules();
-            $module->name     = $this->locString("Breadcrumb{$this->moduleUniqueID}");
+            $module->name     = $this->locString("breadcrumb{$this->moduleUniqueID}");
             $module->disabled = '1';
         }
         $module->uniqid        = $this->moduleUniqueID;
         $module->developer     = $this->developer;
         $module->version       = $this->version;
-        $module->description   = $this->locString("SubHeader{$this->moduleUniqueID}");
+        $module->description   = $this->locString("subheader{$this->moduleUniqueID}");
         $module->support_email = $this->support_email;
 
         return $module->save();
@@ -469,7 +469,7 @@ 
      */
     public function addToSidebar(): bool
     {
-        $menuSettingsKey           = "AdditionalMenuItem{$this->moduleUniqueID}";
+        $menuSettingsKey           = "additionalmenuitem{$this->moduleUniqueID}";
         $unCamelizedControllerName = Text::uncamelize($this->moduleUniqueID, '-');
         $menuSettings              = PbxSettings::findFirstByKey($menuSettingsKey);
         if ($menuSettings === null) {
@@ -481,7 +481,7 @@ 
             'href'          => "/admin-cabinet/{$unCamelizedControllerName}",
             'group'         => 'modules',
             'iconClass'     => 'puzzle',
-            'caption'       => "Breadcrumb{$this->moduleUniqueID}",
+            'caption'       => "breadcrumb{$this->moduleUniqueID}",
             'showAtSidebar' => true,
         ];
         $menuSettings->value = json_encode($value);

Spacing +22 added lines, -22 removed lines

@@ -115,8 +115,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);
@@ -140,7 +140,7 @@ 
             }
         }
 
-        $this->messages  = [];
+        $this->messages = [];
 
 
     }
@@ -155,21 +155,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();
         }
 
@@ -200,7 +200,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');
@@ -223,7 +223,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);
             }
@@ -258,16 +258,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();
         }
 
@@ -315,7 +315,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}";
         Util::mwExec("{$rmPath} -rf {$backupPath}");
         if ($keepSettings) {
@@ -328,21 +328,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);
         }
 
@@ -376,7 +376,7 @@ 
         }
 
         $module = PbxExtensionModules::findFirstByUniqid($this->moduleUniqueID);
-        if ( ! $module) {
+        if (!$module) {
             $module           = new PbxExtensionModules();
             $module->name     = $this->locString("Breadcrumb{$this->moduleUniqueID}");
             $module->disabled = '1';
@@ -402,7 +402,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)) {
@@ -414,7 +414,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)) {
@@ -445,13 +445,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;
             }
 
@@ -477,7 +477,7 @@ 
             $menuSettings      = new PbxSettings();
             $menuSettings->key = $menuSettingsKey;
         }
-        $value               = [
+        $value = [
             'uniqid'        => $this->moduleUniqueID,
             'href'          => "/admin-cabinet/{$unCamelizedControllerName}",
             'group'         => 'modules',

src/Core/System/PBX.php

Spacing +9 added lines, -9 removed lines

@@ -90,7 +90,7 @@ 
             return;
         }
         $max_size    = 2;
-        $log_dir     = System::getLogDir() . '/asterisk/';
+        $log_dir     = System::getLogDir().'/asterisk/';
         $text_config = "{$log_dir}{$f_name} {
     nocreate
     nocopytruncate
@@ -105,8 +105,8 @@ 
         {$asteriskPath} -rx 'logger reload' > /dev/null 2> /dev/null
     endscript
 }";
-        $varEtcDir  = $di->getShared('config')->path('core.varEtcDir');
-        $path_conf   = $varEtcDir . '/asterisk_logrotate_' . $f_name . '.conf';
+        $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
+        $path_conf = $varEtcDir.'/asterisk_logrotate_'.$f_name.'.conf';
         file_put_contents($path_conf, $text_config);
         $mb10 = $max_size * 1024 * 1024;
 
@@ -202,7 +202,7 @@ 
 
     public static function checkCodec($name, $desc, $type): void
     {
-        $codec = Codecs::findFirst('name="' . $name . '"');
+        $codec = Codecs::findFirst('name="'.$name.'"');
         if ($codec === null) {
             /** @var \MikoPBX\Common\Models\Codecs $codec_g722 */
             $codec              = new Codecs();
@@ -218,7 +218,7 @@ 
      */
     public static function sipReload():void
     {
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return;
         }
@@ -234,7 +234,7 @@ 
             Util::mwExec("{$asteriskPath} -rx 'module reload acl'");
             Util::mwExec("{$asteriskPath} -rx 'core reload'");
         } else {
-            Util::sysLogMsg('SIP RELOAD', 'Need reload asterisk',LOG_INFO, LOG_INFO);
+            Util::sysLogMsg('SIP RELOAD', 'Need reload asterisk', LOG_INFO, LOG_INFO);
             // Завершаем каналы.
             Util::mwExec("{$asteriskPath} -rx 'channel request hangup all'");
             usleep(500000);
@@ -247,7 +247,7 @@ 
      */
     public static function iaxReload(): void
     {
-        $iax    = new IAXConf();
+        $iax = new IAXConf();
         $iax->generateConfig();
         $asteriskPath = Util::which('asterisk');
         Util::mwExec("{$asteriskPath} -rx 'iax2 reload'");
@@ -304,7 +304,7 @@ 
             'result' => 'ERROR',
         ];
 
-        if ( ! $this->di->getShared('registry')->booting) {
+        if (!$this->di->getShared('registry')->booting) {
             $this->stop();
         }
         /**
@@ -320,7 +320,7 @@ 
         // Создание базы данных истории звонков.
         /** @var \Phalcon\Db\Adapter\Pdo\Sqlite $connection */
         $connection = $this->di->get('dbCDR');
-        if ( ! $connection->tableExists('cdr')) {
+        if (!$connection->tableExists('cdr')) {
             RegisterDIServices::recreateDBConnections();
         } else {
             CdrDb::checkDb();

src/Core/Asterisk/Configs/SIPConf.php

Spacing +57 added lines, -57 removed lines

@@ -55,15 +55,15 @@ 
         $conf .= $this->generateProvidersPj();
         $conf .= $this->generatePeersPj();
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/pjsip.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/pjsip.conf', $conf);
         $pjConf = '[log_mappings]'."\n".
             'type=log_mappings'."\n".
             'asterisk_error = 0'."\n".
             'asterisk_warning = 2'."\n".
             'asterisk_debug = 1,3,4,5,6'."\n\n";
 
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/pjproject.conf', $pjConf);
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/sorcery.conf', '');
+        file_put_contents($this->config->path('asterisk.astetcdir').'/pjproject.conf', $pjConf);
+        file_put_contents($this->config->path('asterisk.astetcdir').'/sorcery.conf', '');
 
         $db = new AstDB();
         foreach ($this->data_peers as $peer) {
@@ -84,13 +84,13 @@ 
      */
     private function generateGeneralPj(): string
     {
-        $lang    = $this->generalSettings['PBXLanguage'];
+        $lang = $this->generalSettings['PBXLanguage'];
         [$topology, $extipaddr, $exthostname, $subnets] = $this->getTopologyData();
 
         $codecs = $this->getCodecs();
         $codecConf = '';
-        foreach ($codecs as $codec){
-            $codecConf.= "allow = {$codec}\n";
+        foreach ($codecs as $codec) {
+            $codecConf .= "allow = {$codec}\n";
         }
 
         $pbxVersion = PbxSettings::getValueByKey('PBXVersion');
@@ -99,50 +99,50 @@ 
             foreach ($subnets as $net) {
                 $natConf .= "local_net={$net}\n";
             }
-            if ( ! empty($exthostname)) {
+            if (!empty($exthostname)) {
                 $parts = explode(':', $exthostname);
-                $natConf  .= 'external_media_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_port=' . ($parts[1] ?? '5060');
-            } elseif ( ! empty($extipaddr)) {
+                $natConf  .= 'external_media_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_port='.($parts[1] ?? '5060');
+            } elseif (!empty($extipaddr)) {
                 $parts = explode(':', $extipaddr);
-                $natConf  .= 'external_media_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_address=' . $parts[0] . "\n";
-                $natConf  .= 'external_signaling_port=' . ($parts[1] ?? '5060');
+                $natConf  .= 'external_media_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_address='.$parts[0]."\n";
+                $natConf  .= 'external_signaling_port='.($parts[1] ?? '5060');
             }
         }
 
-        $conf = "[general] \n" .
-            "disable_multi_domain=on\n" .
-            "transport = udp \n\n" .
+        $conf = "[general] \n".
+            "disable_multi_domain=on\n".
+            "transport = udp \n\n".
 
-            "[global] \n" .
-            "type = global\n" .
-            "endpoint_identifier_order=username,ip,anonymous\n" .
-            "user_agent = mikopbx-{$pbxVersion}\n\n" .
+            "[global] \n".
+            "type = global\n".
+            "endpoint_identifier_order=username,ip,anonymous\n".
+            "user_agent = mikopbx-{$pbxVersion}\n\n".
 
-            "[anonymous]\n" .
-            "type = endpoint\n" .
+            "[anonymous]\n".
+            "type = endpoint\n".
             $codecConf.
             "language={$lang}\n".
-            "timers = no\n" .
+            "timers = no\n".
             "context = public-direct-dial\n\n".
 
-            "[transport-udp]\n" .
-            "type = transport\n" .
-            "protocol = udp\n" .
+            "[transport-udp]\n".
+            "type = transport\n".
+            "protocol = udp\n".
             "bind=0.0.0.0:{$this->generalSettings['SIPPort']}\n".
             "{$natConf}\n\n".
 
-            "[transport-tcp]\n" .
-            "type = transport\n" .
-            "protocol = tcp\n" .
+            "[transport-tcp]\n".
+            "type = transport\n".
+            "protocol = tcp\n".
             "bind=0.0.0.0:{$this->generalSettings['SIPPort']}\n".
             "{$natConf}\n\n".
             '';
 
         $varEtcDir = $this->config->path('core.varEtcDir');
-        file_put_contents($varEtcDir . '/topology_hash', md5($topology . $exthostname . $extipaddr. $this->generalSettings['SIPPort']));
+        file_put_contents($varEtcDir.'/topology_hash', md5($topology.$exthostname.$extipaddr.$this->generalSettings['SIPPort']));
         $conf .= "\n";
 
         return $conf;
@@ -154,19 +154,19 @@ 
      * @return bool
      */
     public function needAsteriskRestart():bool{
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return false;
         }
-        $mikoPBXConfig  = new MikoPBXConfig();
+        $mikoPBXConfig = new MikoPBXConfig();
         [$topology, $extipaddr, $exthostname] = $this->getTopologyData();
 
         $generalSettings = $mikoPBXConfig->getGeneralSettings();
-        $now_hadh = md5($topology . $exthostname . $extipaddr. $generalSettings['SIPPort']);
-        $old_hash   = '';
+        $now_hadh = md5($topology.$exthostname.$extipaddr.$generalSettings['SIPPort']);
+        $old_hash = '';
         $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
-        if (file_exists($varEtcDir . '/topology_hash')) {
-            $old_hash = file_get_contents($varEtcDir . '/topology_hash');
+        if (file_exists($varEtcDir.'/topology_hash')) {
+            $old_hash = file_get_contents($varEtcDir.'/topology_hash');
         }
 
         return $old_hash !== $now_hadh;
@@ -189,7 +189,7 @@ 
                 continue;
             }
             $sub = new SubnetCalculator($lan_config['ipaddr'], $lan_config['subnet']);
-            $net = $sub->getNetworkPortion() . '/' . $lan_config['subnet'];
+            $net = $sub->getNetworkPortion().'/'.$lan_config['subnet'];
             if ($if_data['topology'] === 'private' && in_array($net, $subnets, true) === false) {
                 $subnets[] = $net;
             }
@@ -227,7 +227,7 @@ 
         $conf        = '';
         $reg_strings = '';
         $prov_config = '';
-        if ($this->data_providers===null){
+        if ($this->data_providers === null) {
             $this->getSettings();
         }
         foreach ($this->data_providers as $provider) {
@@ -236,7 +236,7 @@ 
 
             $need_register = $provider['noregister'] !== '1';
             if ($need_register) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -244,7 +244,7 @@ 
                 $reg_strings .= "[REG-AUTH-{$provider['uniqid']}]\n";
                 $reg_strings .= Util::overrideConfigurationArray($options, $manual_attributes, 'registration-auth');
 
-                $options     = [
+                $options = [
                     'type'                        => 'registration',
                     // 'transport'                   => 'transport-udp',
                     'outbound_auth'               => "REG-AUTH-{$provider['uniqid']}",
@@ -262,7 +262,7 @@ 
             }
 
             if ('1' !== $provider['receive_calls_without_auth']) {
-                $options     = [
+                $options = [
                     'type'     => 'auth',
                     'username' => $provider['username'],
                     'password' => $provider['secret'],
@@ -272,7 +272,7 @@ 
             }
 
             $defaultuser = (trim($provider['defaultuser']) === '') ? $provider['username'] : $provider['defaultuser'];
-            if ( ! empty($defaultuser) && '1' !== $provider['receive_calls_without_auth']) {
+            if (!empty($defaultuser) && '1' !== $provider['receive_calls_without_auth']) {
                 $contact = "sip:$defaultuser@{$provider['host']}:{$port}";
             } else {
                 $contact = "sip:{$provider['host']}:{$port}";
@@ -286,7 +286,7 @@ 
                 'minimum_expiration' => $this->generalSettings['SIPMinExpiry'],
                 'default_expiration' => $this->generalSettings['SIPDefaultExpiry'],
             ];
-            if($provider['qualify'] === '1'){
+            if ($provider['qualify'] === '1') {
                 $options['qualify_frequency'] = $provider['qualifyfreq'];
                 $options['qualify_timeout']   = '3.0';
             }
@@ -294,7 +294,7 @@ 
             $prov_config .= "[{$provider['uniqid']}]\n";
             $prov_config .= Util::overrideConfigurationArray($options, $manual_attributes, 'aor');
 
-            $options     = [
+            $options = [
                 'type'     => 'identify',
                 'endpoint' => $provider['uniqid'],
                 'match'    => $provider['host'],
@@ -355,7 +355,7 @@ 
      */
     public function generatePeersPj(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $lang              = $this->generalSettings['PBXLanguage'];
@@ -369,7 +369,7 @@ 
             $language = (trim($language) === '') ? 'en-en' : $language;
 
             $calleridname = (trim($peer['calleridname']) === '') ? $peer['extension'] : $peer['calleridname'];
-            $busylevel    = (trim($peer['busylevel']) === '') ? '1' : '' . $peer['busylevel'];
+            $busylevel    = (trim($peer['busylevel']) === '') ? '1' : ''.$peer['busylevel'];
 
             $options = [
                 'type'     => 'auth',
@@ -521,7 +521,7 @@ 
             'conditions'=>'disabled="0"',
             'order' => 'type, priority',
         ];
-        $codecs     = Codecs::find($filter);
+        $codecs = Codecs::find($filter);
         foreach ($codecs as $codec_data) {
             $arr_codecs[] = $codec_data->name;
         }
@@ -551,8 +551,8 @@ 
             // Получим используемые кодеки.
             $arr_data['codecs'] = $this->getCodecs();
 
-            $context_id = preg_replace("/[^a-z\d]/iu", '', $sip_peer->host . $sip_peer->port);
-            if ( ! isset($this->contexts_data[$context_id])) {
+            $context_id = preg_replace("/[^a-z\d]/iu", '', $sip_peer->host.$sip_peer->port);
+            if (!isset($this->contexts_data[$context_id])) {
                 $this->contexts_data[$context_id] = [];
             }
             $this->contexts_data[$context_id][$sip_peer->uniqid] = $sip_peer->username;
@@ -571,7 +571,7 @@ 
      */
     private function getOutRoutes(): array
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $rout */
@@ -606,7 +606,7 @@ 
      */
     public function extensionGenContexts(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -624,8 +624,8 @@ 
             $contexts_data = $this->contexts_data[$provider['context_id']];
             if (count($contexts_data) === 1) {
                 $conf .= ExtensionsConf::generateIncomingContextPeers($provider['uniqid'], $provider['username'], '');
-            } elseif ( ! in_array($provider['context_id'], $contexts, true)) {
-                $conf       .= ExtensionsConf::generateIncomingContextPeers(
+            } elseif (!in_array($provider['context_id'], $contexts, true)) {
+                $conf .= ExtensionsConf::generateIncomingContextPeers(
                     $contexts_data,
                     null,
                     $provider['context_id']
@@ -644,7 +644,7 @@ 
      */
     public function extensionGenHints(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         $conf = '';
@@ -657,7 +657,7 @@ 
 
     public function extensionGenInternal(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.
@@ -672,7 +672,7 @@ 
 
     public function extensionGenInternalTransfer(): string
     {
-        if ($this->data_peers===null){
+        if ($this->data_peers === null) {
             $this->getSettings();
         }
         // Генерация внутреннего номерного плана.

src/Core/Asterisk/agi-bin/cdr_connector.php

Spacing +41 added lines, -41 removed lines

@@ -32,14 +32,14 @@ 
     $orign_chan     = $agi->get_variable("orign_chan", true);
     $id             = $agi->get_variable("pt1c_UNIQUEID", true);
     $IS_ORGNT       = $agi->get_variable("IS_ORGNT", true);
-    if ($id == '' || ! empty($QUEUE_SRC_CHAN)) {
+    if ($id == '' || !empty($QUEUE_SRC_CHAN)) {
         // Если это вызов на агента очереди !empty($QUEUE_SRC_CHAN).
         // Если это новый вызов $id == ''.
-        $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+        $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
     // Канал, AGI скрипта.
     $channel  = $agi->request['agi_channel'];
-    $is_local = ! (stripos($channel, 'local/') === false);
+    $is_local = !(stripos($channel, 'local/') === false);
     if ($QUEUE_SRC_CHAN != '' && $is_local) {
         // Это LOCAL, Переопределим на исходный.
         $channel = $QUEUE_SRC_CHAN;
@@ -54,7 +54,7 @@ 
     }
 
     $data['action'] = "$action";
-    if ( ! empty($IS_ORGNT)) {
+    if (!empty($IS_ORGNT)) {
         $dst_num            = $agi->request['agi_callerid'];
         $src_num            = $agi->request['agi_extension'];
         $data['dialstatus'] = 'ORIGINATE';
@@ -65,9 +65,9 @@ 
         $num     = substr($agi->request['agi_channel'], $p_start, $p_end);
 
         $p_start  = strpos($agi->request['agi_channel'], ';');
-        $dst_chan = substr($agi->request['agi_channel'], 0, $p_start) . ';1';
+        $dst_chan = substr($agi->request['agi_channel'], 0, $p_start).';1';
 
-        $id               = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $num . '_' . $IS_ORGNT;
+        $id               = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$num.'_'.$IS_ORGNT;
         $data['dst_chan'] = $dst_chan;
     } else {
         $src_num = $agi->request['agi_callerid'];
@@ -84,7 +84,7 @@ 
     $data['agi_channel']  = $agi->request['agi_channel'];
     $data['did']          = $agi->get_variable("FROM_DID", true);
     $data['from_account'] = $from_account;
-    $data['IS_ORGNT']     = ! empty($IS_ORGNT);
+    $data['IS_ORGNT']     = !empty($IS_ORGNT);
 
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
 
@@ -115,13 +115,13 @@ 
     }
 
     $IS_ORGNT = $agi->get_variable("IS_ORGNT", true);
-    if ( ! empty($IS_ORGNT)) {
+    if (!empty($IS_ORGNT)) {
         // Вероятно необходимо переопределить искать по двум ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
         $peer_mobile = $agi->get_variable("peer_mobile", true);
-        if ( ! empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
-            $id             = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $peer_mobile . '_' . $IS_ORGNT;
+        if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
+            $id             = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT;
             $data['org_id'] = $id;
         }
     }
@@ -154,22 +154,22 @@ 
     $data['BRIDGEPEER']      = $agi->get_variable("FROM_CHAN", true);
 
     $IS_ORGNT = $agi->get_variable("IS_ORGNT", true);
-    if ( ! empty($IS_ORGNT)) {
+    if (!empty($IS_ORGNT)) {
         // Вероятно необходимо переопределить ID.
         // Применимо только для Originate, когда в качестве звонящего используем два канала
         // мобильный и внутренний номер.
         $peer_mobile = $agi->get_variable("peer_mobile", true);
-        if ( ! empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
-            $id             = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $peer_mobile . '_' . $IS_ORGNT;
+        if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) {
+            $id             = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT;
             $data['org_id'] = $id;
         }
     }
 
-    if ( ! empty($data['ENDCALLONANSWER'])) {
+    if (!empty($data['ENDCALLONANSWER'])) {
         $agi->set_variable("__ENDCALLONANSWER", "");
     }
 
-    $PICKUPEER     = trim('' . $agi->get_variable("PICKUPEER", true));
+    $PICKUPEER     = trim(''.$agi->get_variable("PICKUPEER", true));
     $data['dnid']  = $agi->request['agi_dnid'];
     $mikoPBXConfig = new MikoPBXConfig();
     $pickupexten   = $mikoPBXConfig->getGeneralSettings('PBXFeaturePickupExten');
@@ -184,7 +184,7 @@ 
         // Очищаем переменную канала. Больше не требуется.
         $agi->set_variable("PICKUPEER", "");
         $data['old_id'] = $id;
-        $data['id']     = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+        $data['id']     = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
 
@@ -211,7 +211,7 @@ 
     $data['linkedid']    = $agi->get_variable("CDR(linkedid)", true);
     $data['did']         = $agi->get_variable("FROM_DID", true);
 
-    $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     return $data;
 }
@@ -227,12 +227,12 @@ 
 function Event_transfer_dial($agi, $action)
 {
     $now = Util::getNowDate();
-    $id  = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id  = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     // Пытаемся определить канал.
     $TRANSFERERNAME = $agi->get_variable("TRANSFERERNAME", true);
     $QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true);
-    $is_local       = ! (stripos($TRANSFERERNAME, 'local/') === false);
+    $is_local       = !(stripos($TRANSFERERNAME, 'local/') === false);
     if ($QUEUE_SRC_CHAN != '' && $is_local) {
         // Это LOCAL, Переопределим на исходный.
         $channel = $QUEUE_SRC_CHAN;
@@ -247,7 +247,7 @@ 
 
     $data                = [];
     $data['action']      = "$action";
-    $data['agi_channel'] = $channel;// $agi->request['agi_channel'];
+    $data['agi_channel'] = $channel; // $agi->request['agi_channel'];
     $data['linkedid']    = $agi->get_variable("CDR(linkedid)", true);
     $data['src_chan']    = $channel;
     $data['did']         = $agi->get_variable("FROM_DID", true);
@@ -321,7 +321,7 @@ 
     $data['did']          = $agi->get_variable("FROM_DID", true);
     $data['action']       = "$action";
     $data['agi_channel']  = $agi->request['agi_channel'];
-    $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     $pos = stripos($data['agi_channel'], 'local/');
     if ($pos === false) {
@@ -350,7 +350,7 @@ 
     $data                 = [];
     $data['action']       = "$action";
     $data['did']          = $agi->get_variable("FROM_DID", true);
-    $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
 
     $data['linkedid']   = $agi->get_variable("CDR(linkedid)", true);
     $data['dialstatus'] = $agi->get_variable("DIALSTATUS", true);
@@ -385,7 +385,7 @@ 
     $agi->set_variable("pt1c_PARK_CHAN", $park_row['ParkeeChannel']);
 
     // Сбор данных для генерации CDR.
-    $id      = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id      = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $channel = $agi->request['agi_channel'];
     $agi->set_variable("__pt1c_UNIQUEID", "$id");
     $data                 = [];
@@ -403,7 +403,7 @@ 
         $data['src_chan'] = $channel;
         $data['src_num']  = $agi->request['agi_callerid'];
         $data['dst_num']  = $agi->request['agi_extension'];
-        $data['dst_chan'] = 'Park:' . $agi->request['agi_extension'];
+        $data['dst_chan'] = 'Park:'.$agi->request['agi_extension'];
     } elseif (true === $park_row['pt1c_is_dst']) {
         $data['src_chan'] = $channel;
         $data['dst_chan'] = $park_row['ParkeeChannel'];
@@ -419,11 +419,11 @@ 
     if (trim($park_row['ParkingDuration']) !== '') {
         $time_start           = date("Y-m-d H:i:s", time() - 1 * ($park_row['ParkingDuration']));
         $data_parking         = [
-            'UNIQUEID' => $id . '_' . Util::generateRandomString(3),
+            'UNIQUEID' => $id.'_'.Util::generateRandomString(3),
             'src_chan' => $park_row['ParkeeChannel'],
             'src_num'  => $park_row['ParkeeCallerIDNum'],
             'dst_num'  => $park_row['ParkingSpace'],
-            'dst_chan' => 'Park:' . $park_row['ParkingSpace'],
+            'dst_chan' => 'Park:'.$park_row['ParkingSpace'],
             'start'    => $time_start,
             'answer'   => $time_start,
             'endtime'  => $now,
@@ -448,7 +448,7 @@ 
 function Event_unpark_call_timeout($agi, $action)
 {
     $now = Util::getNowDate();
-    $id  = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id  = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     // PARKER=SIP/206
     $PARKING_DURATION = $agi->get_variable("PARKING_DURATION", true);
     $PARKING_DURATION = ($PARKING_DURATION == '') ? 45 : $PARKING_DURATION;
@@ -460,7 +460,7 @@ 
         'src_chan' => $agi->request['agi_channel'], // $agi->get_variable("PARKER", true), // ???
         'src_num'  => $agi->request['agi_callerid'],
         'dst_num'  => $PARKING_SPACE,
-        'dst_chan' => 'Park:' . $PARKING_SPACE,
+        'dst_chan' => 'Park:'.$PARKING_SPACE,
         'start'    => $time_start,
         'answer'   => $time_start,
         'endtime'  => $now,
@@ -472,7 +472,7 @@ 
     ];
 
 
-    $id2 = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id2 = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $agi->set_variable("__pt1c_UNIQUEID", "$id2");
 
     return $data;
@@ -493,8 +493,8 @@ 
     $id         = $agi->get_variable("pt1c_UNIQUEID", true);
     $ISTRANSFER = $agi->get_variable("ISTRANSFER", true);
 
-    if (empty($id) || ! empty($ISTRANSFER)) {
-        $id         = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    if (empty($id) || !empty($ISTRANSFER)) {
+        $id         = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
         $time_start = $now;
     }
 
@@ -503,7 +503,7 @@ 
         // 'src_chan' => $agi->request['agi_channel'],
         // 'src_num'  => $agi->request['agi_callerid'],
         'dst_num'  => $agi->request['agi_extension'],
-        'dst_chan' => 'Queue:' . $agi->request['agi_extension'],
+        'dst_chan' => 'Queue:'.$agi->request['agi_extension'],
         // 'answer'   => $time_start,
         // 'end'  	   => $now,
         'did'      => $agi->get_variable("FROM_DID", true),
@@ -511,7 +511,7 @@ 
         'UNIQUEID' => $id,
         'linkedid' => $agi->get_variable("CDR(linkedid)", true),
     ];
-    if ( ! empty($time_start)) {
+    if (!empty($time_start)) {
         $data['src_chan'] = $agi->get_variable("QUEUE_SRC_CHAN", true);
         $data['src_num']  = $agi->request['agi_callerid'];
         $data['start']    = $time_start;
@@ -519,7 +519,7 @@ 
         $data['transfer'] = '0';
         $agi->set_variable("__pt1c_q_UNIQUEID", "$id");
     }
-    if ( ! empty($ISTRANSFER)) {
+    if (!empty($ISTRANSFER)) {
         $data['transfer'] = '1';
     } else {
         $data['transfer'] = '0';
@@ -590,7 +590,7 @@ 
 
     $is_conf   = ($agi->get_variable('CALLERID(num)', true) === 'Conference_Room');
     $not_local = (stripos($agi->request['agi_channel'], 'local/') === false);
-    if ($not_local && ! $is_conf) {
+    if ($not_local && !$is_conf) {
         $am         = Util::getAstManager();
         $res        = $am->meetMeCollectInfo($exten, ['conf_1c']);
         $callid     = $agi->request['agi_callerid'];
@@ -628,7 +628,7 @@ 
     }
 
     if (empty($id)) {
-        $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+        $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     }
 
     $recordingfile = CdrDb::MeetMeSetRecFilename($id);
@@ -637,7 +637,7 @@ 
         'src_chan'      => $agi->request['agi_channel'],
         'src_num'       => $src_num,
         'dst_num'       => $dst_num,
-        'dst_chan'      => 'MeetMe:' . $mikoidconf,
+        'dst_chan'      => 'MeetMe:'.$mikoidconf,
         'start'         => $time_start,
         'answer'        => $time_start,
         'recordingfile' => "{$recordingfile}.mp3",
@@ -679,7 +679,7 @@ 
     $lamePath = Util::which('lame');
     $nicePath = Util::which('nice');
     $chmodPath = Util::which('chmod');
-    $command               = "{$nicePath} -n 19 {$lamePath} -b 32 --silent \"{$recordingfile}.wav\" \"{$recordingfile}.mp3\" && {$chmodPath} o+r \"{$recordingfile}.mp3\"";
+    $command = "{$nicePath} -n 19 {$lamePath} -b 32 --silent \"{$recordingfile}.wav\" \"{$recordingfile}.mp3\" && {$chmodPath} o+r \"{$recordingfile}.mp3\"";
     Util::mwExecBg($command);
 
     return $data;
@@ -695,14 +695,14 @@ 
  */
 function Event_dial_app($agi, $action)
 {
-    $id        = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString();
+    $id        = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString();
     $extension = $agi->get_variable("APPEXTEN", true);
     if (empty($extension)) {
         $extension = $agi->request['agi_extension'];
     }
 
     $data             = Event_dial($agi, $action);
-    $data['dst_chan'] = 'App:' . $extension;
+    $data['dst_chan'] = 'App:'.$extension;
     $data['dst_num']  = $extension;
     $data['is_app']   = 1;
     $data['UNIQUEID'] = $id;
@@ -743,5 +743,5 @@ 
     $result = $func_name($agi, $action);
     // Оповещение без задержек.
     $data = base64_encode(json_encode($result));
-    $agi->exec("UserEvent", "CdrConnector,AgiData:" . base64_encode(json_encode($result)));
+    $agi->exec("UserEvent", "CdrConnector,AgiData:".base64_encode(json_encode($result)));
 }

src/PBXCoreREST/Lib/FirewallManagementProcessor.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -136,7 +136,7 @@
         if(!file_exists($path_db)){
             // Таблица не существует. Бана нет.
             $res->success    = false;
-            $res->messages[] = "DB {$path_db} not found";
+            $res->messages[] = "db {$path_db} not found";
             return $res;
         }
         $db      = new SQLite3($path_db);

Indentation +15 added lines, -15 removed lines

@@ -80,22 +80,22 @@
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
-             return null;
-         }
-         try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (Throwable $e){
-             return null;
-         }
-         $db->busyTimeout(5000);
-         $fail2ban = new Fail2BanConf();
-         if (false === $fail2ban->tableBanExists($db)) {
-             return null;
-         }
+        public static function getDbConnection(){
+            if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+                return null;
+            }
+            try {
+                $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+            }catch (Throwable $e){
+                return null;
+            }
+            $db->busyTimeout(5000);
+            $fail2ban = new Fail2BanConf();
+            if (false === $fail2ban->tableBanExists($db)) {
+                return null;
+            }
 
-         return $db;
+            return $db;
     }
 
     /**

Spacing +14 added lines, -14 removed lines

@@ -29,18 +29,18 @@ 
      */
     public static function fail2banUnbanAll(string $ip): PBXApiResult
     {
-        $ip     = trim($ip);
+        $ip = trim($ip);
         $res = new PBXApiResult();
         $res->processor = __METHOD__;
         $res->success = true;
-        if ( ! Verify::isIpAddress($ip)) {
+        if (!Verify::isIpAddress($ip)) {
             $res->success = false;
-            $res->messages[]="Not valid ip '{$ip}'.";
+            $res->messages[] = "Not valid ip '{$ip}'.";
         }
-        $fail2ban        = new Fail2BanConf();
+        $fail2ban = new Fail2BanConf();
         if ($fail2ban->fail2ban_enable) {
             $fail2ban = Util::which('fail2ban-client');
-            $res->success  = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
+            $res->success = (Util::mwExec("{$fail2ban} unban {$ip}") === 0);
         } else {
             $res = self::fail2banUnbanDb($ip);
         }
@@ -61,7 +61,7 @@ 
         $res->processor = __METHOD__;
 
         $db = self::getDbConnection();
-        if(!$db){
+        if (!$db) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = 'DB '.Fail2BanConf::FAIL2BAN_DB_PATH.' not found';
@@ -80,13 +80,13 @@ 
         return $res;
     }
 
-     public static function getDbConnection(){
-         if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
+     public static function getDbConnection() {
+         if (!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)) {
              return null;
          }
          try {
-             $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (Throwable $e){
+             $db = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
+         } catch (Throwable $e) {
              return null;
          }
          $db->busyTimeout(5000);
@@ -111,7 +111,7 @@ 
             $ban_time = '43800';
         }
         // Добавленн фильтр по времени бана. возвращаем только адреса, которые еще НЕ разбанены.
-        $q = 'SELECT' . ' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+' . $ban_time . ') AS timeunban FROM bans where (timeofban+' . $ban_time . ')>' . time();
+        $q = 'SELECT'.' DISTINCT jail,ip,MAX(timeofban) AS timeofban, MAX(timeofban+'.$ban_time.') AS timeunban FROM bans where (timeofban+'.$ban_time.')>'.time();
         if ($ip !== null) {
             $q .= " AND ip='{$ip}'";
         }
@@ -134,13 +134,13 @@ 
 
         $jail_q  = ($jail === '') ? '' : "AND jail = '{$jail}'";
         $path_db = Fail2BanConf::FAIL2BAN_DB_PATH;
-        if(!file_exists($path_db)){
+        if (!file_exists($path_db)) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = "DB {$path_db} not found";
             return $res;
         }
-        $db      = new SQLite3($path_db);
+        $db = new SQLite3($path_db);
         $db->busyTimeout(3000);
         $fail2ban = new Fail2BanConf();
         if (false === $fail2ban->tableBanExists($db)) {
@@ -148,7 +148,7 @@ 
             $res->success = true;
             return $res;
         }
-        $q = 'DELETE' . " FROM bans WHERE ip = '{$ip}' {$jail_q}";
+        $q = 'DELETE'." FROM bans WHERE ip = '{$ip}' {$jail_q}";
         $db->query($q);
 
         $err = $db->lastErrorMsg();

Braces +3 added lines, -2 removed lines

@@ -80,13 +80,14 @@
         return $res;
     }
 
-     public static function getDbConnection(){
+     public static function getDbConnection()
+     {
          if(!file_exists(Fail2BanConf::FAIL2BAN_DB_PATH)){
              return null;
          }
          try {
              $db      = new SQLite3(Fail2BanConf::FAIL2BAN_DB_PATH);
-         }catch (Throwable $e){
+         } catch (Throwable $e){
              return null;
          }
          $db->busyTimeout(5000);

src/PBXCoreREST/Lib/SystemManagementProcessor.php

Spacing +19 added lines, -19 removed lines

@@ -162,14 +162,14 @@ 
         $res->data['message'] = 'In progress...';
 
 
-        if ( ! file_exists($tempFilename)) {
+        if (!file_exists($tempFilename)) {
             $res->success    = false;
             $res->messages[] = "Update file '{$tempFilename}' not found.";
 
             return $res;
         }
 
-        if ( ! file_exists('/var/etc/cfdevice')) {
+        if (!file_exists('/var/etc/cfdevice')) {
             $res->success    = false;
             $res->messages[] = "The system is not installed";
 
@@ -198,7 +198,7 @@ 
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
         $moduleMetadata = FilesManagementProcessor::getMetadataFromModuleFile($filePath);
-        if ( ! $moduleMetadata->success) {
+        if (!$moduleMetadata->success) {
             return $moduleMetadata;
         } else {
             $moduleUniqueID = $moduleMetadata->data['uniqid'];
@@ -237,7 +237,7 @@ 
         if (class_exists($pbxExtensionSetupClass)
             && method_exists($pbxExtensionSetupClass, 'installModule')) {
             $setup = new $pbxExtensionSetupClass($moduleUniqueID);
-            if ( ! $setup->installModule()) {
+            if (!$setup->installModule()) {
                 $res->success    = false;
                 $res->messages[] = $setup->getMessages();
             }
@@ -384,15 +384,15 @@ 
             [IncomingRoutingTable::class => ''],
             [OutWorkTimes::class => ''],
             [AsteriskManagerUsers::class => ''],
-            [Extensions::class => 'type="' . Extensions::TYPE_IVR_MENU . '"'],  // IVR Menu
-            [Extensions::class => 'type="' . Extensions::TYPE_CONFERENCE . '"'],  // CONFERENCE
-            [Extensions::class => 'type="' . Extensions::TYPE_QUEUE . '"'],  // QUEUE
+            [Extensions::class => 'type="'.Extensions::TYPE_IVR_MENU.'"'], // IVR Menu
+            [Extensions::class => 'type="'.Extensions::TYPE_CONFERENCE.'"'], // CONFERENCE
+            [Extensions::class => 'type="'.Extensions::TYPE_QUEUE.'"'], // QUEUE
         ];
 
         foreach ($clearThisModels as $modelParams) {
             foreach ($modelParams as $key => $value) {
                 $records = call_user_func([$key, 'find'], $value);
-                if ( ! $records->delete()) {
+                if (!$records->delete()) {
                     $res->messages[] = $records->getMessages();
                     $res->success    = false;
                 }
@@ -400,13 +400,13 @@ 
         }
 
         // Other extensions
-        $parameters     = [
+        $parameters = [
             'conditions' => 'not number IN ({ids:array})',
             'bind'       => [
                 'ids' => [
                     '000063', // Reads back the extension
                     '000064', // 0000MILLI
-                    '10003246',// Echo test
+                    '10003246', // Echo test
                     '10000100' // Voicemail
                 ],
             ],
@@ -420,7 +420,7 @@ 
                 $stopDeleting = true;
                 continue;
             }
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $deleteAttempts += 1;
             }
             if ($deleteAttempts > $countRecords * 10) {
@@ -436,12 +436,12 @@ 
                 'custom' => SoundFiles::CATEGORY_CUSTOM,
             ],
         ];
-        $records    = SoundFiles::find($parameters);
+        $records = SoundFiles::find($parameters);
 
         foreach ($records as $record) {
             if (stripos($record->path, '/storage/usbdisk1/mikopbx') !== false) {
                 Util::mwExec("{$rm} -rf {$record->path}");
-                if ( ! $record->delete()) {
+                if (!$record->delete()) {
                     $res->messages[] = $record->getMessages();
                     $res->success    = false;
                 }
@@ -453,7 +453,7 @@ 
         foreach ($records as $record) {
             $moduleDir = PbxExtensionUtils::getModuleDir($record->uniqid);
             Util::mwExec("{$rm} -rf {$moduleDir}");
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $res->messages[] = $record->getMessages();
                 $res->success    = false;
             }
@@ -461,7 +461,7 @@ 
 
         // Delete CallRecords
         $records = CallDetailRecords::find();
-        if ( ! $records->delete()) {
+        if (!$records->delete()) {
             $res->messages[] = $records->getMessages();
             $res->success    = false;
         }
@@ -486,14 +486,14 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        if ( ! file_exists($filename)) {
+        if (!file_exists($filename)) {
             $res->success    = false;
             $res->messages[] = "File '{$filename}' not found.";
 
             return $res;
         }
         $out          = [];
-        $tmp_filename = '/tmp/' . time() . "_" . basename($filename);
+        $tmp_filename = '/tmp/'.time()."_".basename($filename);
         if (false === copy($filename, $tmp_filename)) {
             $res->success    = false;
             $res->messages[] = "Unable to create temporary file '{$tmp_filename}'.";
@@ -502,8 +502,8 @@ 
         }
 
         // Принудительно устанавливаем расширение файла в wav.
-        $n_filename     = Util::trimExtensionForFile($filename) . ".wav";
-        $n_filename_mp3 = Util::trimExtensionForFile($filename) . ".mp3";
+        $n_filename     = Util::trimExtensionForFile($filename).".wav";
+        $n_filename_mp3 = Util::trimExtensionForFile($filename).".mp3";
         // Конвертируем файл.
         $tmp_filename = escapeshellcmd($tmp_filename);
         $n_filename   = escapeshellcmd($n_filename);

src/Core/Workers/WorkerCdr.php

Braces +2 added lines, -1 removed lines

@@ -241,7 +241,8 @@
 
     /**
      */
-    private function getCheckResult(){
+    private function getCheckResult()
+    {
         $result_data = $this->client_queue->getBody();
         // Получаем результат.
         $result = json_decode($result_data, true);

Spacing +9 added lines, -9 removed lines

@@ -23,7 +23,7 @@ 
 
     public const SELECT_CDR_TUBE = 'select_cdr_tube';
     public const UPDATE_CDR_TUBE = 'update_cdr_tube';
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
 
 
     private BeanstalkClient $client_queue;
@@ -91,7 +91,7 @@ 
             ]
         ];
 
-        $results   = Users::find($parameters);
+        $results = Users::find($parameters);
         foreach ($results as $record) {
             if (empty($record->email)) {
                 continue;
@@ -160,7 +160,7 @@ 
      */
     private function getActiveIdChannels(): array
     {
-        $am           = Util::getAstManager('off');
+        $am = Util::getAstManager('off');
         return $am->GetChannels(true);
     }
 
@@ -175,7 +175,7 @@ 
             $this->no_answered_calls[$row['linkedid']]['NOANSWER'] = false;
             return;
         }
-        if ( ! array_key_exists($row['dst_num'], $this->internal_numbers)) {
+        if (!array_key_exists($row['dst_num'], $this->internal_numbers)) {
             // dst_num - не является номером сотрудника. Это исходящий.
             return;
         }
@@ -240,8 +240,8 @@ 
             if (!empty($row['recordingfile'])) {
                 // Удаляем файлы
                 $p_info = pathinfo($row['recordingfile']);
-                $fileName = $p_info['dirname'] . '/' . $p_info['filename'];
-                $file_list = [$fileName . '.mp3', $fileName . '.wav', $fileName . '_in.wav', $fileName . '_out.wav',];
+                $fileName = $p_info['dirname'].'/'.$p_info['filename'];
+                $file_list = [$fileName.'.mp3', $fileName.'.wav', $fileName.'_in.wav', $fileName.'_out.wav', ];
                 foreach ($file_list as $file) {
                     if (!file_exists($file) || is_dir($file)) {
                         continue;
@@ -263,7 +263,7 @@ 
 
     /**
      */
-    private function getCheckResult(){
+    private function getCheckResult() {
         $result_data = $this->client_queue->getBody();
         // Получаем результат.
         $result = json_decode($result_data, true);
@@ -274,7 +274,7 @@ 
             }
             $result = $file_data;
         }
-        if ( ! is_array($result) && ! is_object($result)) {
+        if (!is_array($result) && !is_object($result)) {
             $result = [];
         }
         return $result;
@@ -299,7 +299,7 @@ 
                 Util::mwExec("rm -rf {$row['recordingfile']}");
             }
         } elseif (!empty($row['recordingfile']) &&
-            !file_exists(Util::trimExtensionForFile($row['recordingfile']) . '.wav') &&
+            !file_exists(Util::trimExtensionForFile($row['recordingfile']).'.wav') &&
             !file_exists($row['recordingfile'])) {
             /** @var CallDetailRecordsTmp $rec_data */
             $rec_data = CallDetailRecordsTmp::findFirst("linkedid='{$row['linkedid']}' AND dst_chan='{$row['dst_chan']}'");

src/Core/Asterisk/Configs/FeaturesConf.php

Spacing +11 added lines, -11 removed lines

@@ -19,16 +19,16 @@ 
 
     protected function generateConfigProtected(): void
     {
-        $conf             = "[general]\n" .
-            "featuredigittimeout = {$this->generalSettings['PBXFeatureDigitTimeout']}\n" .
-            "atxfernoanswertimeout = {$this->generalSettings['PBXFeatureAtxferNoAnswerTimeout']}\n" .
-            "transferdigittimeout = {$this->generalSettings['PBXFeatureTransferDigitTimeout']}\n" .
-            "pickupexten = {$this->generalSettings['PBXFeaturePickupExten']}\n" .
-            "atxferabort = *0\n" .
-            "\n" .
-            "[featuremap]\n" .
-            "atxfer => {$this->generalSettings['PBXFeatureAttendedTransfer']}\n" .
-            "disconnect = *0\n" .
+        $conf = "[general]\n".
+            "featuredigittimeout = {$this->generalSettings['PBXFeatureDigitTimeout']}\n".
+            "atxfernoanswertimeout = {$this->generalSettings['PBXFeatureAtxferNoAnswerTimeout']}\n".
+            "transferdigittimeout = {$this->generalSettings['PBXFeatureTransferDigitTimeout']}\n".
+            "pickupexten = {$this->generalSettings['PBXFeaturePickupExten']}\n".
+            "atxferabort = *0\n".
+            "\n".
+            "[featuremap]\n".
+            "atxfer => {$this->generalSettings['PBXFeatureAttendedTransfer']}\n".
+            "disconnect = *0\n".
             "blindxfer => {$this->generalSettings['PBXFeatureBlindTransfer']}\n";
 
         $additionalModules = $this->di->getShared('pbxConfModules');
@@ -36,7 +36,7 @@ 
             $conf .= $appClass->getFeatureMap();
         }
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/features.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/features.conf', $conf);
     }
 
     // Секция global для extensions.conf.

src/Modules/PbxExtensionUtils.php

Spacing +4 added lines, -4 removed lines

@@ -115,7 +115,7 @@ 
         $moduleAgiBinDir = "{$moduleDir}/agi-bin";
         $files           = glob("$moduleAgiBinDir/*.{php}", GLOB_BRACE);
         foreach ($files as $file) {
-            $newFilename = $agiBinDir . '/' . basename($file);
+            $newFilename = $agiBinDir.'/'.basename($file);
             Util::createUpdateSymlink($file, $newFilename);
         }
 
@@ -136,7 +136,7 @@ 
             $needDisable = false;
             $moduleDir   = PbxExtensionUtils::getModuleDir($module['uniqid']);
             $moduleJson  = "{$moduleDir}/module.json";
-            if ( ! file_exists($moduleJson)) {
+            if (!file_exists($moduleJson)) {
                 $needDisable = true;
             }
             $jsonString            = file_get_contents($moduleJson);
@@ -152,8 +152,8 @@ 
                 } catch (Throwable $exception) {
                     Util::sysLogMsg(__CLASS__, "Can not disable module {$module['uniqid']} Message: {$exception}");
                 } finally {
-                    $currentModule           = PbxExtensionModules::findFirstByUniqid($module['uniqid']);
-                    if ($currentModule->disabled==='0'){
+                    $currentModule = PbxExtensionModules::findFirstByUniqid($module['uniqid']);
+                    if ($currentModule->disabled === '0') {
                         $currentModule->disabled = '1';
                         $currentModule->update();
                     }