mikopbx / Core

src/Core/Workers/WorkerNotifyError.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
                 continue;
             }
             if (Util::isJson($text_error)) {
-                $data       = json_decode($text_error, true);
+                $data = json_decode($text_error, true);
                 $test_email .= "<hr>";
                 $test_email .= "{$section}";
                 $test_email .= "<hr>";

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 +8 added lines, -8 removed lines

@@ -89,7 +89,7 @@ 
             ]
         ];
 
-        $results   = Users::find($parameters);
+        $results = Users::find($parameters);
         foreach ($results as $record) {
             if (empty($record->email)) {
                 continue;
@@ -158,7 +158,7 @@ 
      */
     private function getActiveIdChannels(): array
     {
-        $am           = Util::getAstManager('off');
+        $am = Util::getAstManager('off');
         return $am->GetChannels(true);
     }
 
@@ -173,7 +173,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;
         }
@@ -238,8 +238,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;
@@ -261,7 +261,7 @@ 
 
     /**
      */
-    private function getCheckResult(){
+    private function getCheckResult() {
         $result_data = $this->client_queue->getBody();
         // Получаем результат.
         $result = json_decode($result_data, true);
@@ -272,7 +272,7 @@ 
             }
             $result = $file_data;
         }
-        if ( ! is_array($result) && ! is_object($result)) {
+        if (!is_array($result) && !is_object($result)) {
             $result = [];
         }
         return $result;
@@ -297,7 +297,7 @@ 
                 Processes::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();
                     }

src/Modules/PbxExtensionBase.php

Spacing +6 added lines, -6 removed lines

@@ -52,20 +52,20 @@
         $this->config  = $this->getDI()->getShared('config');
         $modulesDir    = $this->config->path('core.modulesDir');
 
-        if (empty($this->moduleUniqueId)){
+        if (empty($this->moduleUniqueId)) {
             // Get child class parameters and define module Dir and UniqueID
             $reflector = new ReflectionClassAlias(static::class);
             $partsOfNameSpace = explode('\\', $reflector->getNamespaceName());
-            if (count($partsOfNameSpace)===3 && $partsOfNameSpace[0]==='Modules'){
+            if (count($partsOfNameSpace) === 3 && $partsOfNameSpace[0] === 'Modules') {
                 $this->moduleUniqueId = $partsOfNameSpace[1];
-                $this->moduleDir =  $modulesDir.'/'.$this->moduleUniqueId;
+                $this->moduleDir = $modulesDir.'/'.$this->moduleUniqueId;
             }
         } else {
-            $this->moduleDir  = "{$modulesDir}{$this->moduleUniqueId}";
+            $this->moduleDir = "{$modulesDir}{$this->moduleUniqueId}";
         }
 
-        $className        = basename(str_replace('\\', '/', static::class));
-        $this->logger =  new Logger($className, $this->moduleUniqueId);
+        $className = basename(str_replace('\\', '/', static::class));
+        $this->logger = new Logger($className, $this->moduleUniqueId);
 
     }
 }
\ No newline at end of file

src/PBXCoreREST/Lib/CdrDBProcessor.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
         $res = new PBXApiResult();
         $res->processor = __METHOD__;
         $res->success = true;
-        $filter  = [
+        $filter = [
             'order'       => 'id',
             'columns'     => 'start,answer,endtime,src_num,dst_num,did,linkedid',
             'miko_tmp_db' => true,
@@ -66,7 +66,7 @@ 
         $message = $client->request(json_encode($filter), 2);
         if ($message === false) {
             $res->data = [];
-        }else{
+        } else {
                 $res->data[] = $message;
         }
         return $res;
@@ -83,7 +83,7 @@ 
         $res->processor = __METHOD__;
         $res->success = true;
 
-        $filter  = [
+        $filter = [
             'endtime IS NULL',
             'order'               => 'id',
             'columns'             => 'start,answer,src_chan,dst_chan,src_num,dst_num,did,linkedid',
@@ -104,7 +104,7 @@ 
                 $data = json_decode(file_get_contents($result), true);
                 unlink($result);
                 foreach ($data as $row) {
-                    if ( ! isset($active_chans[$row['linkedid']])) {
+                    if (!isset($active_chans[$row['linkedid']])) {
                         // Вызов уже не существует.
                         continue;
                     }

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $message = $client->request(json_encode($filter), 2);
         if ($message === false) {
             $res->data = [];
-        }else{
+        } else{
                 $res->data[] = $message;
         }
         return $res;

src/PBXCoreREST/Lib/FirewallManagementProcessor.php

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;
     }
 
     /**

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);

Spacing +14 added lines, -14 removed lines

@@ -30,18 +30,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  = (Processes::mwExec("{$fail2ban} unban {$ip}") === 0);
+            $res->success = (Processes::mwExec("{$fail2ban} unban {$ip}") === 0);
         } else {
             $res = self::fail2banUnbanDb($ip);
         }
@@ -62,7 +62,7 @@ 
         $res->processor = __METHOD__;
 
         $db = self::getDbConnection();
-        if(!$db){
+        if (!$db) {
             // Таблица не существует. Бана нет.
             $res->success    = false;
             $res->messages[] = 'DB '.Fail2BanConf::FAIL2BAN_DB_PATH.' not found';
@@ -81,13 +81,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);
@@ -112,7 +112,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}'";
         }
@@ -135,13 +135,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)) {
@@ -149,7 +149,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/Notifications.php

Spacing +7 added lines, -7 removed lines

@@ -78,7 +78,7 @@ 
                 $from_name = $settings['MailSMTPFromUsername'];
             }
 
-            $mail->Port    = (integer)$settings['MailSMTPPort'];
+            $mail->Port    = (integer) $settings['MailSMTPPort'];
             $mail->CharSet = 'UTF-8';
 
             $mail->setFrom($from_address, $from_name);
@@ -90,14 +90,14 @@ 
             $mail->Subject = $subject;
             $mail->Body    = $message;
 
-            if ( ! $mail->send()) {
+            if (!$mail->send()) {
                 $messages[] = $mail->ErrorInfo;
             }
         } catch (Throwable $e) {
             $messages[] = $e->getMessage();
         }
 
-        if (count($messages)>0) {
+        if (count($messages) > 0) {
             Util::sysLogMsg('PHPMailer', implode(' ', $messages), LOG_ERR);
             return false;
         }
@@ -109,7 +109,7 @@ 
         $settings             = $mikoPBXConfig->getGeneralSettings();
         $systemNotificationsEmail = $settings['SystemNotificationsEmail'];
         $result = self::sendMail($systemNotificationsEmail, 'Test mail from MIKO PBX', '<b>Test message</b><hr>');
-        return ($result===true);
+        return ($result === true);
     }
 
     /**
@@ -122,10 +122,10 @@ 
         $mikoPBXConfig = new MikoPBXConfig();
         $settings      = $mikoPBXConfig->getGeneralSettings();
 
-        $conf = "defaults\n" .
-            "auth       on\n" .
+        $conf = "defaults\n".
+            "auth       on\n".
             // "logfile    /var/log/msmtp.log\n".
-            "timeout    10\n" .
+            "timeout    10\n".
             "syslog     LOG_LOCAL0\n\n";
 
         if (isset($settings["MailSMTPUseTLS"]) && $settings["MailSMTPUseTLS"] == "1") {

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

Spacing +18 added lines, -18 removed lines

@@ -83,7 +83,7 @@ 
             'slin'  => 'Signed Linear PCM',
             'opus'  => 'Opus',
         ];
-        $codecs      = Codecs::find();
+        $codecs = Codecs::find();
         // Удалим лишние кодеки
         /** @var Codecs $codec */
         foreach ($codecs as $codec) {
@@ -91,10 +91,10 @@ 
                 $this->checkDisabledCodec($codec);
                 continue;
             }
-            if ( ! $codec->delete()) {
+            if (!$codec->delete()) {
                 Util::sysLogMsg(
                     __CLASS__,
-                    'Can not delete codec ' . $codec->name . ' from MikoPBX\Common\Models\Codecs'
+                    'Can not delete codec '.$codec->name.' from MikoPBX\Common\Models\Codecs'
                 );
             }
         }
@@ -109,7 +109,7 @@ 
      */
     private function checkDisabledCodec(Codecs $codec): void
     {
-        if ( ! in_array($codec->disabled, ['0', '1'], true)) {
+        if (!in_array($codec->disabled, ['0', '1'], true)) {
             $codec->disabled = '0';
             $codec->save();
         }
@@ -123,7 +123,7 @@ 
     private function addNewCodecs(array $availCodecs): void
     {
         foreach ($availCodecs as $availCodec => $desc) {
-            $codecData = Codecs::findFirst('name="' . $availCodec . '"');
+            $codecData = Codecs::findFirst('name="'.$availCodec.'"');
             if ($codecData === null) {
                 $codecData = new Codecs();
             } elseif ($codecData->description === $desc) {
@@ -138,10 +138,10 @@ 
             }
             $codecData->type        = $type;
             $codecData->description = $desc;
-            if ( ! $codecData->save()) {
+            if (!$codecData->save()) {
                 Util::sysLogMsg(
                     __CLASS__,
-                    'Can not update codec info ' . $codecData->name . ' from \MikoPBX\Common\Models\Codecs'
+                    'Can not update codec info '.$codecData->name.' from \MikoPBX\Common\Models\Codecs'
                 );
             }
         }
@@ -193,12 +193,12 @@ 
         $astDbPath = $this->config->path('astDatabase.dbfile');
         if (file_exists($astDbPath)) {
             $table = 'astdb';
-            $sql   = 'DELETE FROM ' . $table . ' WHERE key LIKE "/DND/SIP%" OR key LIKE "/CF/SIP%" OR key LIKE "/UserBuddyStatus/SIP%"';
+            $sql   = 'DELETE FROM '.$table.' WHERE key LIKE "/DND/SIP%" OR key LIKE "/CF/SIP%" OR key LIKE "/UserBuddyStatus/SIP%"';
             $db    = new SQLite3($astDbPath);
             try {
                 $db->exec($sql);
             } catch (Throwable $e) {
-                Util::sysLogMsg(__CLASS__, 'Can clean astdb from UserBuddyStatus...' . $e->getMessage());
+                Util::sysLogMsg(__CLASS__, 'Can clean astdb from UserBuddyStatus...'.$e->getMessage());
                 sleep(2);
             }
             $db->close();
@@ -211,12 +211,12 @@ 
      */
     private function copyMohFilesToStorage(): void
     {
-        $oldMohDir = $this->config->path('asterisk.astvarlibdir') . '/sounds/moh';
-        if ( ! file_exists($oldMohDir)) {
+        $oldMohDir = $this->config->path('asterisk.astvarlibdir').'/sounds/moh';
+        if (!file_exists($oldMohDir)) {
             return;
         }
         $currentMohDir = $this->config->path('asterisk.mohdir');
-        if ( ! Util::mwMkdir($currentMohDir)) {
+        if (!Util::mwMkdir($currentMohDir)) {
             return;
         }
 
@@ -225,9 +225,9 @@ 
             if (in_array($file, ['.', '..'])) {
                 continue;
             }
-            if (copy($oldMohDir . '/' . $file, $currentMohDir . '/' . $file)) {
+            if (copy($oldMohDir.'/'.$file, $currentMohDir.'/'.$file)) {
                 $sound_file           = new SoundFiles();
-                $sound_file->path     = $currentMohDir . '/' . $file;
+                $sound_file->path     = $currentMohDir.'/'.$file;
                 $sound_file->category = SoundFiles::CATEGORY_MOH;
                 $sound_file->name     = $file;
                 $sound_file->save();
@@ -291,7 +291,7 @@ 
             Extensions::TYPE_CONFERENCE,
 
         ];
-        $extensions           = Extensions::find();
+        $extensions = Extensions::find();
         foreach ($extensions as $extension) {
             if (in_array($extension->type, $showInPhonebookTypes)) {
                 $extension->show_in_phonebook = '1';
@@ -306,14 +306,14 @@ 
      */
     private function moveReadOnlySoundsToStorage(): void
     {
-        $currentMediaDir = $this->config->path('asterisk.customSoundDir') . '/';
-        if ( ! is_dir($currentMediaDir)) {
+        $currentMediaDir = $this->config->path('asterisk.customSoundDir').'/';
+        if (!is_dir($currentMediaDir)) {
             Util::mwMkdir($currentMediaDir);
         }
         $soundFiles = SoundFiles::find();
         foreach ($soundFiles as $soundFile) {
             if (stripos($soundFile->path, '/offload/asterisk/sounds/other/') === 0) {
-                $newPath = $currentMediaDir . pathinfo($soundFile->path)['basename'];
+                $newPath = $currentMediaDir.pathinfo($soundFile->path)['basename'];
                 if (copy($soundFile->path, $newPath)) {
                     $soundFile->path = $newPath;
                     $soundFile->update();