mikopbx / Core

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

Spacing +19 added lines, -19 removed lines

@@ -84,7 +84,7 @@ 
             'slin'  => 'Signed Linear PCM',
             'opus'  => 'Opus',
         ];
-        $codecs      = Codecs::find();
+        $codecs = Codecs::find();
         // Удалим лишние кодеки
         /** @var Codecs $codec */
         foreach ($codecs as $codec) {
@@ -92,10 +92,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'
                 );
             }
         }
@@ -110,7 +110,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();
         }
@@ -124,7 +124,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) {
@@ -139,10 +139,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'
                 );
             }
         }
@@ -194,12 +194,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();
@@ -212,12 +212,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;
         }
 
@@ -226,9 +226,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();
@@ -292,13 +292,13 @@ 
             Extensions::TYPE_CONFERENCE,
 
         ];
-        $parameters=[
+        $parameters = [
             'conditions'=>'show_in_phonebook!=1 and type IN ({ids:array})',
             'bind'       => [
                 'ids' => $showInPhonebookTypes,
             ],
         ];
-        $extensions           = Extensions::find($parameters);
+        $extensions = Extensions::find($parameters);
         foreach ($extensions as $extension) {
             if (in_array($extension->type, $showInPhonebookTypes)) {
                 $extension->show_in_phonebook = '1';
@@ -313,14 +313,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();

src/Core/System/Configs/IptablesConf.php

Spacing +6 added lines, -6 removed lines

@@ -86,12 +86,12 @@ 
                 file_put_contents('/etc/iptables/iptables.mikopbx', implode("\n", $arr_command));
                 file_put_contents(
                     '/etc/iptables/iptables.mikopbx',
-                    "\n" . implode("\n", $arr_commands_custom),
+                    "\n".implode("\n", $arr_commands_custom),
                     FILE_APPEND
                 );
                 file_put_contents(
                     '/etc/iptables/iptables.mikopbx',
-                    "\n" . $dropCommand,
+                    "\n".$dropCommand,
                     FILE_APPEND
                 );
                 $systemctlPath = Util::which('systemctl');
@@ -136,7 +136,7 @@ 
     {
         $data_port = '';
         if (trim($dport) !== '') {
-            $data_port = '--dport ' . $dport;
+            $data_port = '--dport '.$dport;
         }
         $other_data = trim($other_data);
 
@@ -169,9 +169,9 @@ 
                 continue;
             }
             $other_data = "-p {$rule->protocol}";
-            $other_data .= ($network_filter === null) ? '' : ' -s ' . $network_filter->permit;
+            $other_data .= ($network_filter === null) ? '' : ' -s '.$network_filter->permit;
             if ($rule->protocol === 'icmp') {
-                $port       = '';
+                $port = '';
                 $other_data .= ' --icmp-type echo-request';
             }
 
@@ -218,7 +218,7 @@ 
                     } else {
                         $newRule->action = 'block';
                     }
-                    if (key_exists($key, $currentRules[$networkFilter->id])){
+                    if (key_exists($key, $currentRules[$networkFilter->id])) {
                         $newRule->description = $currentRules[$networkFilter->id][$key]['description'];
                     }
                     $newRule->save();