mikopbx / Core

src/AdminCabinet/Controllers/OutboundRoutesController.php

Spacing +4 added lines, -4 removed lines

@@ -51,7 +51,7 @@ 
                     'trimfrombegin'    => $rule->trimfrombegin,
                     'prepend'          => $rule->prepend,
                     'note'             => $rule->note,
-                    'rulename'         => '<i class="icon attention"></i> ' . $rule->getRepresent(),
+                    'rulename'         => '<i class="icon attention"></i> '.$rule->getRepresent(),
                     'disabled'         => false,
                 ];
             }
@@ -105,14 +105,14 @@ 
             switch ($name) {
                 case 'restnumbers':
                 {
-                    if ( ! array_key_exists($name, $data)) {
+                    if (!array_key_exists($name, $data)) {
                         continue 2;
                     }
                     $rule->$name = $data[$name] === '' ? '-1' : $data[$name];
                     break;
                 }
                 default:
-                    if ( ! array_key_exists($name, $data)) {
+                    if (!array_key_exists($name, $data)) {
                         continue 2;
                     }
                     $rule->$name = $data[$name];
@@ -164,7 +164,7 @@ 
         $this->view->disable();
         $result = false;
 
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
         $data = $this->request->getPost();

src/PBXCoreREST/Lib/LicenseManagementProcessor.php

Spacing +10 added lines, -10 removed lines

@@ -116,10 +116,10 @@ 
                     $this->license->changeLicenseKey($data['licKey']);
                     $this->license->addTrial('11'); // MikoPBX forever license
                     $res->success = true;
-                } elseif ( ! empty($licenseInfo) && strpos($licenseInfo, '2026') !== false) {
+                } elseif (!empty($licenseInfo) && strpos($licenseInfo, '2026') !== false) {
                     $res->success    = false;
                     $res->messages[] = $this->translation->_('lic_FailedCheckLicense2026');
-                } elseif ( ! empty($licenseInfo)) {
+                } elseif (!empty($licenseInfo)) {
                     $res->messages[] = $licenseInfo;
                     $res->success    = false;
                 } else {
@@ -127,20 +127,20 @@ 
                     $res->success    = false;
                 }
             }
-            if ( ! empty($data['coupon'])) {
+            if (!empty($data['coupon'])) {
                 $result = $this->license->activateCoupon($data['coupon']);
                 if ($result === true) {
                     $res->messages[] = $this->translation->_('lic_SuccessfulCouponActivated');
                     $res->success    = true;
                 } else {
-                    $res->messages[] = $this->license->translateLicenseErrorMessage((string)$result);
+                    $res->messages[] = $this->license->translateLicenseErrorMessage((string) $result);
                     $res->success    = false;
                 }
             }
         } else { // Only add trial for license key
             $newLicenseKey = $this->license->getTrialLicense($data);
             if (strlen($newLicenseKey) === 28
-                && Text::startsWith((string)$newLicenseKey, 'MIKO-')) {
+                && Text::startsWith((string) $newLicenseKey, 'MIKO-')) {
                 $mikoPBXConfig->setGeneralSettings('PBXLicense', $newLicenseKey);
                 $this->license->changeLicenseKey($newLicenseKey);
                 $res->success    = true;
@@ -212,8 +212,8 @@ 
         $licFeatureId = $data['licFeatureId'];
         $licProductId = $data['licProductId'];
 
-        if ( ! isset($licFeatureId, $licProductId)) {
-            $res->messages[]='The feature id or product id is empty.';
+        if (!isset($licFeatureId, $licProductId)) {
+            $res->messages[] = 'The feature id or product id is empty.';
             return $res;
         }
         $res->success = true;
@@ -243,7 +243,7 @@ 
     {
         $res = new PBXApiResult();
         $res->processor = __METHOD__;
-        $res->success= true;
+        $res->success = true;
 
         // License Key
         $licenseKey = PbxSettings::getValueByKey('PBXLicense');
@@ -251,10 +251,10 @@ 
         $dataMetrics = [];
 
         // PBXVersion
-        $dataMetrics['PBXname'] = 'MikoPBX@' . PbxSettings::getValueByKey('PBXVersion');
+        $dataMetrics['PBXname'] = 'MikoPBX@'.PbxSettings::getValueByKey('PBXVersion');
 
         // SIP Extensions count
-        $extensions                   = Extensions::find('type="'.Extensions::TYPE_SIP.'"');
+        $extensions = Extensions::find('type="'.Extensions::TYPE_SIP.'"');
         $dataMetrics['CountSipExtensions'] = $extensions->count();
 
         // Interface language

src/Core/Asterisk/Configs/CelConf.php

Spacing +6 added lines, -6 removed lines

@@ -19,12 +19,12 @@
 
     protected function generateConfigProtected(): void
     {
-        $conf = "[general]\n" .
-            "enable=yes\n" .
-            "events=CHAN_START,CHAN_END,ANSWER\n" .
-            "dateformat = %F %T\n\n" .
-            "[manager]\n" .
+        $conf = "[general]\n".
+            "enable=yes\n".
+            "events=CHAN_START,CHAN_END,ANSWER\n".
+            "dateformat = %F %T\n\n".
+            "[manager]\n".
             "enabled = yes\n\n";
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/cel.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/cel.conf', $conf);
     }
 }
\ No newline at end of file

src/Core/System/Configs/Fail2BanConf.php

Spacing +56 added lines, -56 removed lines

@@ -44,7 +44,7 @@ 
     {
         $fail2ban = new self();
         if ($fail2ban->fail2ban_enable
-            && ! $fail2ban->fail2banIsRunning()) {
+            && !$fail2ban->fail2banIsRunning()) {
             $fail2ban->fail2banStart();
         }
     }
@@ -138,7 +138,7 @@ 
         $create_link = false;
 
         // Символическая ссылка на базу данных.
-        if (file_exists($res_file)){
+        if (file_exists($res_file)) {
             if (filetype($res_file) !== 'link') {
                 unlink($res_file);
                 $create_link = true;
@@ -191,59 +191,59 @@ 
         }
         $this->generateJails();
 
-        $jails        = [
+        $jails = [
             'dropbear'    => 'iptables-allports[name=SSH, protocol=all]',
             'mikopbx-www' => 'iptables-allports[name=HTTP, protocol=all]',
         ];
         $modulesJails = $this->generateModulesJailsLocal();
         $jails        = array_merge($jails, $modulesJails);
-        $config       = "[DEFAULT]\n" .
+        $config       = "[DEFAULT]\n".
             "ignoreip = 127.0.0.1 {$user_whitelist}\n\n";
 
         $syslog_file = SyslogConf::getSyslogFile();
 
         foreach ($jails as $jail => $action) {
-            $config .= "[{$jail}]\n" .
-                "enabled = true\n" .
-                "backend = process\n" .
-                "logpath = {$syslog_file}\n" .
+            $config .= "[{$jail}]\n".
+                "enabled = true\n".
+                "backend = process\n".
+                "logpath = {$syslog_file}\n".
                 // "logprocess = logread -f\n".
-                "maxretry = {$max_retry}\n" .
-                "findtime = {$find_time}\n" .
-                "bantime = {$ban_time}\n" .
-                "logencoding = utf-8\n" .
+                "maxretry = {$max_retry}\n".
+                "findtime = {$find_time}\n".
+                "bantime = {$ban_time}\n".
+                "logencoding = utf-8\n".
                 "action = {$action}\n\n";
         }
 
-        $log_dir = System::getLogDir() . '/asterisk/';
-        $config  .= "[asterisk_security_log]\n" .
-            "enabled = true\n" .
-            "filter = asterisk\n" .
-            "action = iptables-allports[name=ASTERISK, protocol=all]\n" .
-            "logencoding = utf-8\n" .
-            "maxretry = {$max_retry}\n" .
-            "findtime = {$find_time}\n" .
-            "bantime = {$ban_time}\n" .
+        $log_dir = System::getLogDir().'/asterisk/';
+        $config .= "[asterisk_security_log]\n".
+            "enabled = true\n".
+            "filter = asterisk\n".
+            "action = iptables-allports[name=ASTERISK, protocol=all]\n".
+            "logencoding = utf-8\n".
+            "maxretry = {$max_retry}\n".
+            "findtime = {$find_time}\n".
+            "bantime = {$ban_time}\n".
             "logpath = {$log_dir}security_log\n\n";
 
-        $config .= "[asterisk_error]\n" .
-            "enabled = true\n" .
-            "filter = asterisk\n" .
-            "action = iptables-allports[name=ASTERISK_ERROR, protocol=all]\n" .
-            "maxretry = {$max_retry}\n" .
-            "findtime = {$find_time}\n" .
-            "bantime = {$ban_time}\n" .
-            "logencoding = utf-8\n" .
+        $config .= "[asterisk_error]\n".
+            "enabled = true\n".
+            "filter = asterisk\n".
+            "action = iptables-allports[name=ASTERISK_ERROR, protocol=all]\n".
+            "maxretry = {$max_retry}\n".
+            "findtime = {$find_time}\n".
+            "bantime = {$ban_time}\n".
+            "logencoding = utf-8\n".
             "logpath = {$log_dir}error\n\n";
 
-        $config .= "[asterisk_public]\n" .
-            "enabled = true\n" .
-            "filter = asterisk\n" .
-            "action = iptables-allports[name=ASTERISK_PUBLIC, protocol=all]\n" .
-            "maxretry = {$max_retry}\n" .
-            "findtime = {$find_time}\n" .
-            "bantime = {$ban_time}\n" .
-            "logencoding = utf-8\n" .
+        $config .= "[asterisk_public]\n".
+            "enabled = true\n".
+            "filter = asterisk\n".
+            "action = iptables-allports[name=ASTERISK_PUBLIC, protocol=all]\n".
+            "maxretry = {$max_retry}\n".
+            "findtime = {$find_time}\n".
+            "bantime = {$ban_time}\n".
+            "logencoding = utf-8\n".
             "logpath = {$log_dir}messages\n\n";
 
         Util::fileWriteContent('/etc/fail2ban/jail.local', $config);
@@ -256,23 +256,23 @@ 
     {
         $filterPath = self::FILTER_PATH;
 
-        $conf = "[INCLUDES]\n" .
-            "before = common.conf\n" .
-            "[Definition]\n" .
-            "_daemon = [\S\W\s]+web_auth\n" .
-            'failregex = ^%(__prefix_line)sFrom:\s<HOST>\sUserAgent:(\S|\s)*Wrong password$' . "\n" .
-            '            ^(\S|\s)*nginx:\s+\d+/\d+/\d+\s+(\S|\s)*status\s+403(\S|\s)*client:\s+<HOST>(\S|\s)*' . "\n" .
+        $conf = "[INCLUDES]\n".
+            "before = common.conf\n".
+            "[Definition]\n".
+            "_daemon = [\S\W\s]+web_auth\n".
+            'failregex = ^%(__prefix_line)sFrom:\s<HOST>\sUserAgent:(\S|\s)*Wrong password$'."\n".
+            '            ^(\S|\s)*nginx:\s+\d+/\d+/\d+\s+(\S|\s)*status\s+403(\S|\s)*client:\s+<HOST>(\S|\s)*'."\n".
             "ignoreregex =\n";
         file_put_contents("{$filterPath}/mikopbx-www.conf", $conf);
 
-        $conf = "[INCLUDES]\n" .
-            "before = common.conf\n" .
-            "[Definition]\n" .
-            "_daemon = (authpriv.warn )?dropbear\n" .
-            'prefregex = ^%(__prefix_line)s<F-CONTENT>(?:[Ll]ogin|[Bb]ad|[Ee]xit).+</F-CONTENT>$' . "\n" .
-            'failregex = ^[Ll]ogin attempt for nonexistent user (\'.*\' )?from <HOST>:\d+$' . "\n" .
-            '            ^[Bb]ad (PAM )?password attempt for .+ from <HOST>(:\d+)?$' . "\n" .
-            '            ^[Ee]xit before auth \(user \'.+\', \d+ fails\): Max auth tries reached - user \'.+\' from <HOST>:\d+\s*$' . "\n" .
+        $conf = "[INCLUDES]\n".
+            "before = common.conf\n".
+            "[Definition]\n".
+            "_daemon = (authpriv.warn )?dropbear\n".
+            'prefregex = ^%(__prefix_line)s<F-CONTENT>(?:[Ll]ogin|[Bb]ad|[Ee]xit).+</F-CONTENT>$'."\n".
+            'failregex = ^[Ll]ogin attempt for nonexistent user (\'.*\' )?from <HOST>:\d+$'."\n".
+            '            ^[Bb]ad (PAM )?password attempt for .+ from <HOST>(:\d+)?$'."\n".
+            '            ^[Ee]xit before auth \(user \'.+\', \d+ fails\): Max auth tries reached - user \'.+\' from <HOST>:\d+\s*$'."\n".
             "ignoreregex =\n";
         file_put_contents("{$filterPath}/dropbear.conf", $conf);
 
@@ -291,9 +291,9 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'generateFail2BanJails')) {
                 $content = $appClass->generateFail2BanJails();
-                if ( ! empty($content)) {
+                if (!empty($content)) {
                     $moduleUniqueId = $appClass->moduleUniqueId;
-                    $fileName = Text::uncamelize($moduleUniqueId,'_').'.conf';
+                    $fileName = Text::uncamelize($moduleUniqueId, '_').'.conf';
                     file_put_contents("{$filterPath}/{$fileName}", $content);
                 }
             }
@@ -312,9 +312,9 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'generateFail2BanJails')) {
                 $content = $appClass->generateFail2BanJails();
-                if ( ! empty($content)) {
-                    $moduleUniqueId                    = $appClass->moduleUniqueId;
-                    $fileName = Text::uncamelize($moduleUniqueId,'_');
+                if (!empty($content)) {
+                    $moduleUniqueId = $appClass->moduleUniqueId;
+                    $fileName = Text::uncamelize($moduleUniqueId, '_');
                     $jails[$fileName] = "iptables-allports[name={$moduleUniqueId}, protocol=all]";
                 }
             }

src/Core/Workers/WorkerCallEvents.php

Braces +6 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
                 $this->am->SetVar($channel, 'MIX_FILE_NAME', $srcFile);
                 $this->am->SetVar($channel, 'MIX_CMD',       $command);
                 $this->am->SetVar($channel, 'MIX_OPTIONS',   $options);
-            }else{
+            } else{
                 $res        = $this->am->MixMonitor($channel, $srcFile, $options, $command);
                 $res['cmd'] = "MixMonitor($channel, $file_name)";
                 CdrDb::LogEvent(json_encode($res));
@@ -100,7 +100,7 @@ 
     {
         if(isset($this->mixMonitorChannels[$channel])){
             unset($this->mixMonitorChannels[$channel]);
-        }else{
+        } else{
             return;
         }
         if ($this->record_calls) {
@@ -502,7 +502,7 @@ 
     {
         if( isset($this->checkChanHangupTransfer[$data['agi_channel']]) ) {
             return;
-        }else{
+        } else{
             $this->checkChanHangupTransfer[$data['agi_channel']] = $action;
         }
 
@@ -1314,7 +1314,8 @@ 
      * Проверка фильтра на корректность bind параметров.
      * @param $filter
      */
-    private function filterNotValid($filter){
+    private function filterNotValid($filter)
+    {
         $haveErrors = false;
         if(isset($filter['bind'])){
             if(is_array($filter)){
@@ -1323,7 +1324,7 @@ 
                         $haveErrors = true;
                     }
                 }
-            }else{
+            } else{
                 $haveErrors = true;
             }
         }

Spacing +92 added lines, -92 removed lines

@@ -39,15 +39,15 @@ 
      */
     public function MixMonitor($channel, $file_name = null, $sub_dir = null, $full_name = null, $onlySetVar = false): string
     {
-        $resFile = $this->mixMonitorChannels[$channel]??'';
-        if($resFile !== ''){
+        $resFile = $this->mixMonitorChannels[$channel] ?? '';
+        if ($resFile !== '') {
             return $resFile;
         }
 
-        $resFile           = '';
+        $resFile = '';
         $file_name = str_replace('/', '_', $file_name);
         if ($this->record_calls) {
-            if ( ! file_exists($full_name)) {
+            if (!file_exists($full_name)) {
                 $monitor_dir = Storage::getMonitorDir();
                 if ($sub_dir === null) {
                     $sub_dir = date('Y/m/d/H/');
@@ -67,7 +67,7 @@ 
             $chmodPath  = Util::which('chmod');
 
             $arr = $this->am->GetChannels(false);
-            if(!in_array($channel, $arr)){
+            if (!in_array($channel, $arr)) {
                 CdrDb::LogEvent("MixMonitor: Channel {$channel} not found.");
                 return '';
             }
@@ -75,11 +75,11 @@ 
             $srcFile = "{$f}.wav";
             $resFile = "{$f}.mp3";
             $command = "{$nicePath} -n 19 {$lamePath} -b 32 --silent '{$srcFile}' '{$resFile}' && {$chmodPath} o+r '{$resFile}'";
-            if($onlySetVar){
+            if ($onlySetVar) {
                 $this->am->SetVar($channel, 'MIX_FILE_NAME', $srcFile);
-                $this->am->SetVar($channel, 'MIX_CMD',       $command);
-                $this->am->SetVar($channel, 'MIX_OPTIONS',   $options);
-            }else{
+                $this->am->SetVar($channel, 'MIX_CMD', $command);
+                $this->am->SetVar($channel, 'MIX_OPTIONS', $options);
+            } else {
                 $res        = $this->am->MixMonitor($channel, $srcFile, $options, $command);
                 $res['cmd'] = "MixMonitor($channel, $file_name)";
                 CdrDb::LogEvent(json_encode($res));
@@ -98,9 +98,9 @@ 
      */
     public function StopMixMonitor($channel): void
     {
-        if(isset($this->mixMonitorChannels[$channel])){
+        if (isset($this->mixMonitorChannels[$channel])) {
             unset($this->mixMonitorChannels[$channel]);
-        }else{
+        } else {
             return;
         }
         if ($this->record_calls) {
@@ -140,7 +140,7 @@ 
         foreach ($m_data as $row) {
             $row->writeAttribute('endtime', $data['start']);
             $res = $row->update();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_app_end', implode(' ', $row->getMessages()));
             }
         }
@@ -159,7 +159,7 @@ 
             // мобильный и внутренний номер.
             $filter = [
                 '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:org_id:) AND endtime = ""',
-                'bind' => ['UNIQUEID' => $data['UNIQUEID'], 'org_id' => $data['org_id'],],
+                'bind' => ['UNIQUEID' => $data['UNIQUEID'], 'org_id' => $data['org_id'], ],
             ];
         } else {
             $filter = [
@@ -176,14 +176,14 @@ 
         /** @var CallDetailRecordsTmp $row */
         $m_data = CallDetailRecordsTmp::find($filter);
         foreach ($m_data as $row) {
-            if ( ! is_object($row)) {
+            if (!is_object($row)) {
                 continue;
             }
             ///
             // Проверим, если более одного канала SIP/256 при входящем.
             $column_chan_name = ('ORIGINATE' === $row->dialstatus) ? 'src_chan' : 'dst_chan';
 
-            if ( ! empty($row->$column_chan_name) && $data['dst_chan'] !== $row->$column_chan_name) {
+            if (!empty($row->$column_chan_name) && $data['dst_chan'] !== $row->$column_chan_name) {
                 if ($row_create) {
                     continue;
                 }
@@ -197,7 +197,7 @@ 
                     $new_row->writeAttribute($attribute, $value);
                 }
                 $new_row->writeAttribute($column_chan_name, $data['dst_chan']);
-                $new_row->writeAttribute('UNIQUEID', $data['UNIQUEID'] . '_' . $data['dst_chan']);
+                $new_row->writeAttribute('UNIQUEID', $data['UNIQUEID'].'_'.$data['dst_chan']);
                 // Подмена $row;
                 $row        = $new_row;
                 $row_create = true;
@@ -210,8 +210,8 @@ 
                 // При оригинации меняется местами srs_chan в поле dst_chan.
                 $row->writeAttribute('src_chan', $data['dst_chan']);
             } else {
-                if ( ! $rec_start) {
-                    $data['recordingfile'] = $this->MixMonitor($data['dst_chan'], $row->UNIQUEID,null, $row->recordingfile,true);
+                if (!$rec_start) {
+                    $data['recordingfile'] = $this->MixMonitor($data['dst_chan'], $row->UNIQUEID, null, $row->recordingfile, true);
                     $row->writeAttribute('recordingfile', $data['recordingfile']);
                     $rec_start = true;
                 }
@@ -219,14 +219,14 @@ 
                 $row->writeAttribute('dst_chan', $data['dst_chan']);
             }
 
-            if (isset($data['to_account']) && ! empty($data['to_account'])) {
+            if (isset($data['to_account']) && !empty($data['to_account'])) {
                 $row->writeAttribute($account_col, $data['to_account']);
             }
-            if (isset($data['dst_call_id']) && ! empty($data['dst_call_id'])) {
+            if (isset($data['dst_call_id']) && !empty($data['dst_call_id'])) {
                 $row->writeAttribute('dst_call_id', $data['dst_call_id']);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_dial_create_chan', implode(' ', $row->getMessages()));
             }
         }
@@ -246,7 +246,7 @@ 
             // Событие возникает, когда мы пытаемся перехватить вызов на соседний телефон.
             $filter = [
                 'UNIQUEID=:UNIQUEID:',
-                'bind' => ['UNIQUEID' => $data['old_id'],],
+                'bind' => ['UNIQUEID' => $data['old_id'], ],
             ];
             /** @var CallDetailRecordsTmp $m_data */
             $m_data = CallDetailRecordsTmp::find($filter);
@@ -260,7 +260,7 @@ 
                 $new_data['dst_chan']       = $data['agi_channel'];
                 $new_data['dst_num']        = $data['dst_num'];
                 $new_data['UNIQUEID']       = $data['id'];
-                $new_data['recordingfile']  = $this->MixMonitor($new_data['dst_chan'],  'pickup_'.$new_data['UNIQUEID']);
+                $new_data['recordingfile']  = $this->MixMonitor($new_data['dst_chan'], 'pickup_'.$new_data['UNIQUEID']);
 
                 unset($new_data['id']);
                 unset($new_data['end']);
@@ -273,7 +273,7 @@ 
                 $this->am->UserEvent('CdrConnector', ['AgiData' => $AgiData]);
             }
         } else {
-            if ( ! empty($data['ENDCALLONANSWER'])) {
+            if (!empty($data['ENDCALLONANSWER'])) {
                 // Переменная ENDCALLONANSWER устанавливается при начале работы умной маршуртизации.
                 // Как только произошел ответ на вызов, отметим вызов на приложение как завершенный.
                 $filter = [
@@ -290,7 +290,7 @@ 
                     $row->writeAttribute('endtime', $data['answer']);
                     $row->writeAttribute('is_app', 1);
                     $res = $row->save();
-                    if ( ! $res) {
+                    if (!$res) {
                         Util::sysLogMsg('ENDCALLONANSWER', implode(' ', $row->getMessages()));
                     }
                 }
@@ -312,7 +312,7 @@ 
                     '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer = "" AND endtime = ""',
                     'bind' => [
                         'UNIQUEID'      => $data['id'],
-                        'UNIQUEID_CHAN' => $data['id'] . '_' . $data['agi_channel'],
+                        'UNIQUEID_CHAN' => $data['id'].'_'.$data['agi_channel'],
                     ],
                 ];
             }
@@ -325,7 +325,7 @@ 
                         continue;
                     }
                     // Найдем все прочие CDR по данному originate и отметим как завершенные.
-                    $filter      = [
+                    $filter = [
                         'linkedid=:linkedid: AND endtime <> "" AND src_chan <> :src_chan:',
                         'bind' => [
                             'linkedid' => $row->linkedid,
@@ -339,7 +339,7 @@ 
                             $orgn_row->writeAttribute('endtime', $data['answer']);
                         }
                         $orgn_row->writeAttribute('dst_chan', '');
-                        $orgn_row->writeAttribute('UNIQUEID', $data['id'] . '_' . $orgn_row->src_chan);
+                        $orgn_row->writeAttribute('UNIQUEID', $data['id'].'_'.$orgn_row->src_chan);
                         $orgn_row->update();
                     }
 
@@ -352,7 +352,7 @@ 
                     $row->writeAttribute('answer', $data['answer']);
                 }
                 $res = $row->save();
-                if ( ! $res) {
+                if (!$res) {
                     Util::sysLogMsg('Action_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -378,10 +378,10 @@ 
         $this->hangupChanCheckSipTrtansfer($data, $channels);
 
         // Очистим память.
-        if(isset($this->checkChanHangupTransfer[$data['agi_channel']])){
+        if (isset($this->checkChanHangupTransfer[$data['agi_channel']])) {
             unset($this->checkChanHangupTransfer[$data['agi_channel']]);
         }
-        if(isset($this->mixMonitorChannels[$data['agi_channel']])){
+        if (isset($this->mixMonitorChannels[$data['agi_channel']])) {
             unset($this->mixMonitorChannels[$data['agi_channel']]);
         }
     }
@@ -393,24 +393,24 @@ 
      */
     private function hangupChanCheckSipTrtansfer($data, $channels):void{
         $not_local = (stripos($data['agi_channel'], 'local/') === false);
-        if($not_local === false || $data['OLD_LINKEDID'] !== $data['linkedid']) {
+        if ($not_local === false || $data['OLD_LINKEDID'] !== $data['linkedid']) {
             return;
         }
         $active_chans = $this->am->GetChannels(false);
         // Намек на SIP трансфер.
         foreach ($channels as $data_chan) {
-            if ( ! in_array($data_chan['chan'], $active_chans, true)) {
+            if (!in_array($data_chan['chan'], $active_chans, true)) {
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
             $BRIDGEPEER = $this->am->GetVar($data_chan['chan'], 'BRIDGEPEER', null, false);
-            if ( ! in_array($BRIDGEPEER, $active_chans, true) || !is_string($BRIDGEPEER)) {
+            if (!in_array($BRIDGEPEER, $active_chans, true) || !is_string($BRIDGEPEER)) {
                 // Вызов уже завершен. Не интересно.
                 continue;
             }
 
             $linkedid = $this->am->GetVar($data_chan['chan'], 'CDR(linkedid)', null, false);
-            if ( empty($linkedid) || $linkedid === $data['linkedid']) {
+            if (empty($linkedid) || $linkedid === $data['linkedid']) {
                 continue;
             }
 
@@ -423,7 +423,7 @@ 
             $n_data['start']         = date('Y-m-d H:i:s');
             $n_data['answer']        = date('Y-m-d H:i:s');
             $n_data['linkedid']      = $linkedid;
-            $n_data['UNIQUEID']      = $data['linkedid'] . Util::generateRandomString();
+            $n_data['UNIQUEID']      = $data['linkedid'].Util::generateRandomString();
             $n_data['transfer']      = '0';
             $n_data['recordingfile'] = $this->MixMonitor($n_data['dst_chan'], $n_data['UNIQUEID']);
             $n_data['did']           = $data_chan['did'];
@@ -455,7 +455,7 @@ 
      * @param array $channels
      */
     private function hangupChanEndCalls(array $data, array &$transfer_calls, array &$channels):void{
-        $filter         = [
+        $filter = [
             'linkedid=:linkedid: AND endtime = "" AND (src_chan=:src_chan: OR dst_chan=:dst_chan:)',
             'bind' => [
                 'linkedid' => $data['linkedid'],
@@ -472,8 +472,8 @@ 
             }
             if ($row->dialstatus === 'ORIGINATE') {
                 $row->writeAttribute('dialstatus', '');
-                if($row->answer === ''){
-                    $newId = $row->linkedid.'_'.$row->src_num.'_'.substr($row->src_chan, strpos($row->src_chan,'-') +1);
+                if ($row->answer === '') {
+                    $newId = $row->linkedid.'_'.$row->src_num.'_'.substr($row->src_chan, strpos($row->src_chan, '-') + 1);
                     $row->writeAttribute('UNIQUEID', $newId);
                 }
             }
@@ -486,7 +486,7 @@ 
                 $row->writeAttribute('dialstatus', $data['dialstatus']);
             }
             $res = $row->update();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan', implode(' ', $row->getMessages()));
             }
 
@@ -518,14 +518,14 @@ 
      */
     public function Action_CreateRowTransfer($action, $data, $calls_data = null): void
     {
-        if( isset($this->checkChanHangupTransfer[$data['agi_channel']]) ) {
+        if (isset($this->checkChanHangupTransfer[$data['agi_channel']])) {
             return;
-        }else{
+        } else {
             $this->checkChanHangupTransfer[$data['agi_channel']] = $action;
         }
 
         if (null === $calls_data) {
-            $filter     = [
+            $filter = [
                 'linkedid=:linkedid: AND endtime = "" AND transfer=1 AND (src_chan=:chan: OR dst_chan=:chan:)',
                 'bind'  => [
                     'linkedid' => $data['linkedid'],
@@ -547,8 +547,8 @@ 
                     $insert_data[$fname_chan] = $row_data['dst_chan'];
                     $insert_data[$fname_num]  = $row_data['dst_num'];
                 } else {
-                    $fname_chan = ! isset($insert_data['src_chan']) ? 'src_chan' : 'dst_chan';
-                    $fname_num  = ! isset($insert_data['src_num']) ? 'src_num' : 'dst_num';
+                    $fname_chan = !isset($insert_data['src_chan']) ? 'src_chan' : 'dst_chan';
+                    $fname_num  = !isset($insert_data['src_num']) ? 'src_num' : 'dst_num';
 
                     $insert_data[$fname_chan] = $row_data['src_chan'];
                     $insert_data[$fname_num]  = $row_data['src_num'];
@@ -559,7 +559,7 @@ 
             $this->StopMixMonitor($insert_data['dst_chan']);
             $recordingfile = $this->MixMonitor(
                 $insert_data['dst_chan'],
-                'transfer_' . $insert_data['src_num'] . '_' . $insert_data['dst_num'] . '_' . $data['linkedid']
+                'transfer_'.$insert_data['src_num'].'_'.$insert_data['dst_num'].'_'.$data['linkedid']
             );
             //
             $insert_data['action']        = "{$action}_end_trasfer";
@@ -581,7 +581,7 @@ 
 
             $this->insertDataToDbM($insert_data);
             CdrDb::LogEvent(json_encode($insert_data));
-        } elseif (empty($calls_data[0]['answer']) && count($calls_data) === 1 && ! empty($calls_data[0]['recordingfile'])) {
+        } elseif (empty($calls_data[0]['answer']) && count($calls_data) === 1 && !empty($calls_data[0]['recordingfile'])) {
             // Возобновление записи разговора при срыве переадресации.
             $row_data = $calls_data[0];
             $chan     = ($data['agi_channel'] === $row_data['src_chan']) ? $row_data['dst_chan'] : $row_data['src_chan'];
@@ -597,12 +597,12 @@ 
             /** @var CallDetailRecordsTmp $row */
             $not_ended_cdr = null;
             $transferNotComplete = false;
-            foreach ($cdr as $row){
-                if($row->transfer === '1' && ($row->src_chan === $chan || $row->dst_chan === $chan) ){
+            foreach ($cdr as $row) {
+                if ($row->transfer === '1' && ($row->src_chan === $chan || $row->dst_chan === $chan)) {
                     $not_ended_cdr = $row;
                 }
-                if($row->answer === '' && $row->endtime === ''
-                    && ($row->src_chan === $chan || $row->dst_chan === $chan) ){
+                if ($row->answer === '' && $row->endtime === ''
+                    && ($row->src_chan === $chan || $row->dst_chan === $chan)) {
                     $transferNotComplete = true;
                 }
             }
@@ -660,7 +660,7 @@ 
      */
     public function Action_transfer_dial_create_chan($data): void
     {
-        $filter     = [
+        $filter = [
             'UNIQUEID=:UNIQUEID: AND endtime = "" AND answer = ""',
             'bind' => [
                 'UNIQUEID' => $data['transfer_UNIQUEID'],
@@ -673,7 +673,7 @@ 
         foreach ($m_data as $row) {
             ///
             // Проверим, если более одного канала SIP/256 при входящем.
-            if ( ! empty($row->dst_chan) && $data['dst_chan'] !== $row->dst_chan) {
+            if (!empty($row->dst_chan) && $data['dst_chan'] !== $row->dst_chan) {
                 if ($row_create) {
                     continue;
                 }
@@ -687,7 +687,7 @@ 
                     $new_row->writeAttribute($attribute, $value);
                 }
                 $new_row->writeAttribute('dst_chan', $data['dst_chan']);
-                $new_row->writeAttribute('UNIQUEID', $data['transfer_UNIQUEID'] . '_' . $data['dst_chan']);
+                $new_row->writeAttribute('UNIQUEID', $data['transfer_UNIQUEID'].'_'.$data['dst_chan']);
                 // $new_row->save();
                 // Подмена $row;
                 $row        = $new_row;
@@ -700,11 +700,11 @@ 
 
             $row->writeAttribute('dst_chan', $data['dst_chan']);
             $row->writeAttribute('recordingfile', $data['recordingfile']);
-            if (isset($data['dst_call_id']) && ! empty($data['dst_call_id'])) {
+            if (isset($data['dst_call_id']) && !empty($data['dst_call_id'])) {
                 $row->writeAttribute('dst_call_id', $data['dst_call_id']);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_transfer_dial_create_chan', implode(' ', $row->getMessages()));
             }
         }
@@ -721,7 +721,7 @@ 
             '(UNIQUEID=:UNIQUEID: OR UNIQUEID=:UNIQUEID_CHAN:) AND answer = "" AND endtime = ""',
             'bind' => [
                 'UNIQUEID'      => $data['transfer_UNIQUEID'],
-                'UNIQUEID_CHAN' => $data['transfer_UNIQUEID'] . '_' . $data['agi_channel'],
+                'UNIQUEID_CHAN' => $data['transfer_UNIQUEID'].'_'.$data['agi_channel'],
             ],
         ];
 
@@ -731,7 +731,7 @@ 
         foreach ($m_data as $row) {
             $row->writeAttribute('answer', $data['answer']);
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
             }
         }
@@ -765,7 +765,7 @@ 
                 // Завершим вызов в CDR.
                 $row->writeAttribute('endtime', $data['end']);
                 $row->writeAttribute('transfer', 0);
-                if ( ! $row->save()) {
+                if (!$row->save()) {
                     Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -800,7 +800,7 @@ 
                 // Ответа не было. Переадресация отменена.
                 $row->writeAttribute('endtime', $data['end']);
                 $row->writeAttribute('transfer', 0);
-                if ( ! $row->save()) {
+                if (!$row->save()) {
                     Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -820,7 +820,7 @@ 
                 $this->MixMonitor($row->src_chan, $info['filename'], $subdir);
                 // Снимем со строк признак переадресации.
                 $row->writeAttribute('transfer', 0);
-                if ( ! $row->save()) {
+                if (!$row->save()) {
                     Util::sysLogMsg('Action_transfer_dial_answer', implode(' ', $row->getMessages()));
                 }
             }
@@ -896,7 +896,7 @@ 
 
                 $f_list = $m_data->toArray();
                 foreach ($data as $attribute => $value) {
-                    if ( ! array_key_exists($attribute, $f_list)) {
+                    if (!array_key_exists($attribute, $f_list)) {
                         continue;
                     }
                     $m_data->writeAttribute($attribute, $value);
@@ -967,7 +967,7 @@ 
             $row->writeAttribute('answer', $data['answer']);
             $row->writeAttribute('endtime', $data['answer']);
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_queue_answer', implode(' ', $row->getMessages()));
             }
         }
@@ -996,7 +996,7 @@ 
                 $row->writeAttribute('dialstatus', $data['dialstatus']);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_queue_end', implode(' ', $row->getMessages()));
             }
         }
@@ -1026,11 +1026,11 @@ 
             if ($dest_chan === $row->dst_chan) {
                 $is_local        = (stripos($data['src_chan'], 'local/') !== false);
                 $is_stored_local = (stripos($row->src_chan, 'local/') !== false);
-                if ($row->UNIQUEID === $data['UNIQUEID'] && $is_local && ! $is_stored_local) {
+                if ($row->UNIQUEID === $data['UNIQUEID'] && $is_local && !$is_stored_local) {
                     $data['src_chan'] = $row->src_chan;
                 }
                 if (file_exists($row->recordingfile) || file_exists(
-                        Util::trimExtensionForFile($row->recordingfile) . '.wav'
+                        Util::trimExtensionForFile($row->recordingfile).'.wav'
                     )) {
                     // Переопределим путь к файлу записи разговора. Для конферецнии файл один.
                     $recordingfile = $row->recordingfile;
@@ -1042,7 +1042,7 @@ 
             // Подменим ID на идентификатор конференции.
             $row->writeAttribute('linkedid', $data['meetme_id']);
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan_meetme', implode(' ', $row->getMessages()));
             }
         }
@@ -1059,11 +1059,11 @@ 
             $row->writeAttribute('transfer', 0);
             $row->writeAttribute('linkedid', $data['meetme_id']);
 
-            if ( ! empty($recordingfile)) {
+            if (!empty($recordingfile)) {
                 $row->writeAttribute('recordingfile', $recordingfile);
             }
             $res = $row->save();
-            if ( ! $res) {
+            if (!$res) {
                 Util::sysLogMsg('Action_hangup_chan_meetme', implode(' ', $row->getMessages()));
             }
         }
@@ -1102,9 +1102,9 @@ 
      */
     public function callEventsWorker($tube): void
     {
-        $data      = json_decode($tube->getBody(), true);
-        $funcName = "Action_".$data['action']??'';
-        if ( method_exists($this, $funcName) ) {
+        $data = json_decode($tube->getBody(), true);
+        $funcName = "Action_".$data['action'] ?? '';
+        if (method_exists($this, $funcName)) {
             $this->$funcName($data);
         }
         $tube->reply(json_encode(true));
@@ -1134,14 +1134,14 @@ 
     public function updateDataInDbM($data): bool
     {
         if (empty($data['UNIQUEID'])) {
-            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty ' . json_encode($data));
+            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty '.json_encode($data));
 
             return false;
         }
 
         $filter = [
             "UNIQUEID=:id:",
-            'bind' => ['id' => $data['UNIQUEID'],],
+            'bind' => ['id' => $data['UNIQUEID'], ],
         ];
         /** @var CallDetailRecordsTmp $m_data */
         $m_data = CallDetailRecordsTmp::findFirst($filter);
@@ -1150,7 +1150,7 @@ 
         }
         $f_list = $m_data->toArray();
         foreach ($data as $attribute => $value) {
-            if ( ! array_key_exists($attribute, $f_list)) {
+            if (!array_key_exists($attribute, $f_list)) {
                 continue;
             }
             if ('UNIQUEID' == $attribute) {
@@ -1159,7 +1159,7 @@ 
             $m_data->writeAttribute($attribute, $value);
         }
         $res = $m_data->save();
-        if ( ! $res) {
+        if (!$res) {
             Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
         }
 
@@ -1199,7 +1199,7 @@ 
     public static function insertDataToDbM($data): bool
     {
         if (empty($data['UNIQUEID'])) {
-            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty ' . json_encode($data));
+            Util::sysLogMsg(__FUNCTION__, 'UNIQUEID is empty '.json_encode($data));
 
             return false;
         }
@@ -1209,7 +1209,7 @@ 
         $m_data = CallDetailRecordsTmp::findFirst(
             [
                 "UNIQUEID=:id:",
-                'bind' => ['id' => $data['UNIQUEID'],],
+                'bind' => ['id' => $data['UNIQUEID'], ],
             ]
         );
         if ($m_data === null) {
@@ -1218,7 +1218,7 @@ 
         } elseif (isset($data['IS_ORGNT']) && $data['IS_ORGNT'] !== false && $data['action'] == 'dial') {
             if (empty($m_data->endtime)) {
                 // Если это оригинация dial может прийти дважды.
-                if(!empty($m_data->src_num) && $m_data->src_num === $data['dst_num']){
+                if (!empty($m_data->src_num) && $m_data->src_num === $data['dst_num']) {
                     $m_data->dst_num = $data['src_num'];
                     $m_data->save();
                 }
@@ -1243,7 +1243,7 @@ 
                 $new_m_data->transfer     = $data['transfer'];
 
                 $res = $new_m_data->save();
-                if ( ! $res) {
+                if (!$res) {
                     Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
                 }
 
@@ -1253,7 +1253,7 @@ 
 
         $f_list = $m_data->toArray();
         foreach ($data as $attribute => $value) {
-            if ( ! array_key_exists($attribute, $f_list)) {
+            if (!array_key_exists($attribute, $f_list)) {
                 continue;
             }
             if ($is_new === false && 'UNIQUEID' == $attribute) {
@@ -1262,7 +1262,7 @@ 
             $m_data->writeAttribute($attribute, $value);
         }
         $res = $m_data->save();
-        if ( ! $res) {
+        if (!$res) {
             Util::sysLogMsg(__FUNCTION__, implode(' ', $m_data->getMessages()));
         }
 
@@ -1277,12 +1277,12 @@ 
         $q      = $tube->getBody();
         $filter = json_decode($q, true);
 
-        if($this->filterNotValid($filter)){
+        if ($this->filterNotValid($filter)) {
             $tube->reply('[]');
             return;
         }
 
-        $res    = null;
+        $res = null;
         try {
             if (isset($filter['miko_tmp_db'])) {
                 $res = CallDetailRecordsTmp::find($filter);
@@ -1301,7 +1301,7 @@ 
             }
             $filter['add_pack_query']['bind'][$filter['columns']] = $arr;
 
-            if($this->filterNotValid($filter['add_pack_query'])){
+            if ($this->filterNotValid($filter['add_pack_query'])) {
                 $tube->reply('[]');
                 return;
             }
@@ -1319,7 +1319,7 @@ 
         if (isset($filter['miko_result_in_file'])) {
             $di         = Di::getDefault();
             $dirsConfig = $di->getShared('config');
-            $filename   = $dirsConfig->path('core.tempDir') . '/' . md5(microtime(true));
+            $filename   = $dirsConfig->path('core.tempDir').'/'.md5(microtime(true));
             file_put_contents($filename, $res_data);
             Util::addRegularWWWRights($filename);
             $res_data = json_encode($filename);
@@ -1332,16 +1332,16 @@ 
      * Проверка фильтра на корректность bind параметров.
      * @param $filter
      */
-    private function filterNotValid($filter){
+    private function filterNotValid($filter) {
         $haveErrors = false;
-        if(isset($filter['bind'])){
-            if(is_array($filter)){
+        if (isset($filter['bind'])) {
+            if (is_array($filter)) {
                 foreach ($filter['bind'] as $bindValue) {
-                    if(empty($bindValue)){
+                    if (empty($bindValue)) {
                         $haveErrors = true;
                     }
                 }
-            }else{
+            } else {
                 $haveErrors = true;
             }
         }
@@ -1350,7 +1350,7 @@ 
 
     public function errorHandler($m): void
     {
-        Util::sysLogMsg(self::class . '_ERROR', $m);
+        Util::sysLogMsg(self::class.'_ERROR', $m);
     }
 }
 

src/PBXCoreREST/Lib/SystemManagementProcessor.php

Indentation +1 added lines, -1 removed lines

@@ -365,7 +365,7 @@
         // Delete CallRecords sound files
         $callRecordsPath  = $di->getShared('config')->path('asterisk.monitordir');
         if (stripos($callRecordsPath, '/storage/usbdisk1/mikopbx') !== false) {
-             Util::mwExec("{$rm} -rf {$callRecordsPath}/*");
+                Util::mwExec("{$rm} -rf {$callRecordsPath}/*");
         }
 
         return $res;

Spacing +25 added lines, -25 removed lines

@@ -168,14 +168,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";
 
@@ -199,8 +199,8 @@ 
         $res                             = new PBXApiResult();
         $res->processor                  = __METHOD__;
         $di = DI::getDefault();
-        if ($di===null){
-            $res->messages[]='Error on DI initialize';
+        if ($di === null) {
+            $res->messages[] = 'Error on DI initialize';
             return $res;
         }
 
@@ -209,33 +209,33 @@ 
         $rm                              = Util::which('rm');
 
         // Pre delete some types
-        $clearThisModels=[
+        $clearThisModels = [
             [Providers::class=>''],
             [OutgoingRoutingTable::class=>''],
             [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 [$class_name, $parameters]){
-            $records =  call_user_func([$class_name, 'find'], $parameters);
-            if ( ! $records->delete()) {
+        foreach ($clearThisModels as [$class_name, $parameters]) {
+            $records = call_user_func([$class_name, 'find'], $parameters);
+            if (!$records->delete()) {
                 $res->messages[] = $records->getMessages();
                 $res->success    = false;
             }
         }
 
         // 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
                 ],
             ],
@@ -249,7 +249,7 @@ 
                 $stopDeleting = true;
                 continue;
             }
-            if ( ! $record->delete()) {
+            if (!$record->delete()) {
                 $deleteAttempts += 1;
             }
             if ($deleteAttempts > $countRecords * 10) {
@@ -265,12 +265,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;
                 }
@@ -282,7 +282,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;
             }
@@ -290,13 +290,13 @@ 
 
         // Delete CallRecords
         $records = CallDetailRecords::find();
-        if ( ! $records->delete()) {
+        if (!$records->delete()) {
             $res->messages[] = $records->getMessages();
             $res->success    = false;
         }
 
         // Delete CallRecords sound files
-        $callRecordsPath  = $di->getShared('config')->path('asterisk.monitordir');
+        $callRecordsPath = $di->getShared('config')->path('asterisk.monitordir');
         if (stripos($callRecordsPath, '/storage/usbdisk1/mikopbx') !== false) {
              Util::mwExec("{$rm} -rf {$callRecordsPath}/*");
         }
@@ -317,7 +317,7 @@ 
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
         $moduleMetadata = FilesManagementProcessor::getMetadataFromModuleFile($filePath);
-        if ( ! $moduleMetadata->success) {
+        if (!$moduleMetadata->success) {
             return $moduleMetadata;
         } else {
             $moduleUniqueID = $moduleMetadata->data['uniqid'];
@@ -356,7 +356,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();
             }
@@ -439,14 +439,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}'.";
@@ -455,8 +455,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/PBXCoreREST/Lib/FirewallManagementProcessor.php

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

@@ -77,7 +77,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);
@@ -119,7 +119,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);

Spacing +11 added lines, -11 removed lines

@@ -27,18 +27,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);
         }
@@ -66,7 +66,7 @@ 
         }
 
         // Добавленн фильтр по времени бана. возвращаем только адреса, которые еще НЕ разбанены.
-        $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}'";
@@ -74,13 +74,13 @@ 
         $q .= ' GROUP BY jail,ip';
 
         $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(5000);
         $fail2ban = new Fail2BanConf();
         if (false === $fail2ban->tableBanExists($db)) {
@@ -116,13 +116,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)) {
@@ -130,7 +130,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();

src/Core/System/Upgrade/Releases/UpdateConfigsUpToVer62110.php

Indentation +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
  */
 class UpdateConfigsUpToVer62110 extends Injectable implements UpgradeSystemConfigInterface
 {
-  	public const PBX_VERSION = '6.2.110';
+        public const PBX_VERSION = '6.2.110';
 
     public function processUpdate():void
     {

src/Core/System/Upgrade/Releases/UpdateConfigsUpToVer100.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 class UpdateConfigsUpToVer100 extends Injectable implements UpgradeSystemConfigInterface
 {
-  	public const PBX_VERSION = '1.0.0';
+        public const PBX_VERSION = '1.0.0';
 
     public function processUpdate():void
     {

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
         /** @var \MikoPBX\Common\Models\Sip $peer */
         $peers = Sip::find('type="peer"');
         foreach ($peers as $peer) {
-            $peer->secret = md5('' . time() . 'sip' . $peer->id);
+            $peer->secret = md5(''.time().'sip'.$peer->id);
             $peer->save();
         }
 
@@ -38,7 +38,7 @@ 
         /** @var \MikoPBX\Common\Models\AsteriskManagerUsers $manager */
         $managers = AsteriskManagerUsers::find();
         foreach ($managers as $manager) {
-            $manager->secret = md5('' . time() . 'manager' . $manager->id);
+            $manager->secret = md5(''.time().'manager'.$manager->id);
             $manager->save();
         }
     }