mikopbx / Core

src/Core/Workers/WorkerCdr.php

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 @@ 
                 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/Workers/WorkerBase.php

Spacing +3 added lines, -3 removed lines

@@ -87,7 +87,7 @@ 
             file_put_contents($this->getPidFile(), $activeProcesses);
         } else {
             $pidFilesDir = dirname($this->getPidFile());
-            $pidFile     = $pidFilesDir . '/' . pathinfo($this->getPidFile(), PATHINFO_BASENAME);
+            $pidFile     = $pidFilesDir.'/'.pathinfo($this->getPidFile(), PATHINFO_BASENAME);
             // Delete old PID files
             $rm = Util::which('rm');
             Processes::mwExec("{$rm} -rf {$pidFile}*");
@@ -125,7 +125,7 @@ 
      */
     public function pingCallBack(BeanstalkClient $message): void
     {
-        $message->reply(json_encode($message->getBody() . ':pong'));
+        $message->reply(json_encode($message->getBody().':pong'));
     }
 
     /**
@@ -165,7 +165,7 @@ 
     public function __destruct()
     {
         $pidFilesDir = dirname($this->getPidFile());
-        $pidFile     = $pidFilesDir . '/' . pathinfo($this->getPidFile(), PATHINFO_BASENAME);
+        $pidFile     = $pidFilesDir.'/'.pathinfo($this->getPidFile(), PATHINFO_BASENAME);
         // Delete old PID files
         $rm = Util::which('rm');
         Processes::mwExec("{$rm} -rf {$pidFile}*");

src/Core/Workers/Cron/WorkerSafeScriptsCore.php

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

@@ -165,7 +165,7 @@ 
             }
             if (false === $result) {
                 Processes::processPHPWorker($workerClassName);
-                Util::sysLogMsg(__CLASS__, "Service {$workerClassName} started.");
+                Util::sysLogMsg(__CLASS__, "service {$workerClassName} started.");
             }
             $time_elapsed_secs = microtime(true) - $start;
             if ($time_elapsed_secs > 10) {
@@ -233,7 +233,7 @@ 
 
             if ($res_ping === false && $level < 10) {
                 Processes::processPHPWorker($workerClassName);
-                Util::sysLogMsg(__CLASS__, "Service {$workerClassName} started.");
+                Util::sysLogMsg(__CLASS__, "service {$workerClassName} started.");
                 // Wait 1 second while service will be ready to listen requests
                 sleep(1);
 

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\"";
     Processes::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/Core/System/Network.php

Spacing +64 added lines, -64 removed lines

@@ -29,7 +29,7 @@ 
         }
 
         Processes::killByName('pcapsipdump');
-        $log_dir = System::getLogDir() . '/pcapsipdump';
+        $log_dir = System::getLogDir().'/pcapsipdump';
         Util::mwMkdir($log_dir);
 
         $network         = new Network();
@@ -38,7 +38,7 @@ 
         foreach ($arr_eth as $eth) {
             $pid_file = "/var/run/pcapsipdump_{$eth}.pid";
             Processes::mwExecBg(
-                $pcapsipdumpPath . ' -T 120 -P ' . $pid_file . ' -i ' . $eth . ' -m \'^(INVITE|REGISTER)$\' -L ' . $log_dir . '/dump.db'
+                $pcapsipdumpPath.' -T 120 -P '.$pid_file.' -i '.$eth.' -m \'^(INVITE|REGISTER)$\' -L '.$log_dir.'/dump.db'
             );
         }
     }
@@ -146,10 +146,10 @@ 
         /** @var \MikoPBX\Common\Models\LanInterfaces $res */
         $res = LanInterfaces::findFirst("internet = '1'");
         if (null !== $res) {
-            if ( ! empty($res->primarydns) && '127.0.0.1' != $res->primarydns) {
+            if (!empty($res->primarydns) && '127.0.0.1' != $res->primarydns) {
                 $dns[] = $res->primarydns;
             }
-            if ( ! empty($res->secondarydns) && '127.0.0.1' != $res->secondarydns) {
+            if (!empty($res->secondarydns) && '127.0.0.1' != $res->secondarydns) {
                 $dns[] = $res->secondarydns;
             }
         }
@@ -165,39 +165,39 @@ 
     public function generatePdnsdConfig($named_dns): void
     {
         $tempDir   = $this->di->getShared('config')->path('core.tempDir');
-        $cache_dir = $tempDir . '/pdnsd/cache';
+        $cache_dir = $tempDir.'/pdnsd/cache';
         Util::mwMkdir($cache_dir);
 
-        $conf = 'global {' . "\n" .
-            '	perm_cache=10240;' . "\n" .
-            '	cache_dir="' . $cache_dir . '";' . "\n" .
-            '	pid_file = /var/run/pdnsd.pid;' . "\n" .
-            '	run_as="nobody";' . "\n" .
-            '	server_ip = 127.0.0.1;' . "\n" .
-            '	status_ctl = on;' . "\n" .
-            '	query_method=udp_tcp;' . "\n" .
-            '	min_ttl=15m;' . "\n" .
-            '	max_ttl=1w;' . "\n" .
-            '	timeout=10;' . "\n" .
-            '	neg_domain_pol=on;' . "\n" .
-            '	run_as=root;' . "\n" .
-            '	daemon=on;' . "\n" .
-            '}' . "\n" .
-            'server {' . "\n" .
-            '	label = "main";' . "\n" .
-            '	ip = ' . implode(', ', $named_dns) . ';' . "\n" .
-            '	interface=lo;' . "\n" .
-            '	uptest=if;' . "\n" .
-            '	interval=10m;' . "\n" .
-            '	purge_cache=off;' . "\n" .
+        $conf = 'global {'."\n".
+            '	perm_cache=10240;'."\n".
+            '	cache_dir="'.$cache_dir.'";'."\n".
+            '	pid_file = /var/run/pdnsd.pid;'."\n".
+            '	run_as="nobody";'."\n".
+            '	server_ip = 127.0.0.1;'."\n".
+            '	status_ctl = on;'."\n".
+            '	query_method=udp_tcp;'."\n".
+            '	min_ttl=15m;'."\n".
+            '	max_ttl=1w;'."\n".
+            '	timeout=10;'."\n".
+            '	neg_domain_pol=on;'."\n".
+            '	run_as=root;'."\n".
+            '	daemon=on;'."\n".
+            '}'."\n".
+            'server {'."\n".
+            '	label = "main";'."\n".
+            '	ip = '.implode(', ', $named_dns).';'."\n".
+            '	interface=lo;'."\n".
+            '	uptest=if;'."\n".
+            '	interval=10m;'."\n".
+            '	purge_cache=off;'."\n".
             '}';
 
-        $pdnsdConfFile  = '/etc/pdnsd.conf';
+        $pdnsdConfFile = '/etc/pdnsd.conf';
         $savedConf = '';
-        if(file_exists($pdnsdConfFile)){
+        if (file_exists($pdnsdConfFile)) {
             $savedConf = file_get_contents($pdnsdConfFile);
         }
-        if($savedConf != $conf){
+        if ($savedConf != $conf) {
             file_put_contents($pdnsdConfFile, $conf);
         }
         $pdnsdPath = Util::which('pdnsd');
@@ -205,7 +205,7 @@ 
         if (!empty($pid) && $savedConf === $conf) {
             // Выполним дополнительную проверку, работает ли сервер.
             $resultResolve = gethostbynamel('lic.miko.ru');
-            if($resultResolve !== false){
+            if ($resultResolve !== false) {
                 // Ничего делать не нужно. Конфиг не изменился. Рестарт не требуется.
                 return;
             }
@@ -282,7 +282,7 @@ 
                  */
                 $pid_file = "/var/run/udhcpc_{$if_name}";
                 $pid_pcc  = Processes::getPidOfProcess($pid_file);
-                if ( ! empty($pid_pcc) && file_exists($pid_file)) {
+                if (!empty($pid_pcc) && file_exists($pid_file)) {
                     // Завершаем старый процесс.
                     $killPath = Util::which('kill');
                     $catPath  = Util::which('cat');
@@ -411,10 +411,10 @@ 
 
             $result = [''];
             if (file_exists('/etc/static-routes')) {
-                $command = "{$catPath} /etc/static-routes " .
-                    "| {$grepPath} '^rout' " .
-                    "| {$busyboxPath} awk -F ';' '{print $1}' " .
-                    "| {$grepPath} '{$if_name}\$' " .
+                $command = "{$catPath} /etc/static-routes ".
+                    "| {$grepPath} '^rout' ".
+                    "| {$busyboxPath} awk -F ';' '{print $1}' ".
+                    "| {$grepPath} '{$if_name}\$' ".
                     "| {$awkPath} -F 'dev {$if_name}' '{ print $1 }'";
                 Processes::mwExec($command, $result);
             }
@@ -424,19 +424,19 @@ 
 
             if ($if_data['vlanid'] > 0) {
                 // Пока только статика.
-                $lan_config = "auto {$if_data['interface_orign']}.{$if_data['vlanid']}\n" .
-                    "iface {$if_data['interface_orign']}.{$if_data['vlanid']} inet static \n" .
-                    "address {$ipaddr}\n" .
-                    "netmask {$subnet}\n" .
-                    "gateway {$gateway}\n" .
-                    "dns-nameservers 127.0.0.1\n" .
-                    "vlan_raw_device {$if_data['interface_orign']}\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_data['interface_orign']}.{$if_data['vlanid']}\n".
+                    "iface {$if_data['interface_orign']}.{$if_data['vlanid']} inet static \n".
+                    "address {$ipaddr}\n".
+                    "netmask {$subnet}\n".
+                    "gateway {$gateway}\n".
+                    "dns-nameservers 127.0.0.1\n".
+                    "vlan_raw_device {$if_data['interface_orign']}\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             } elseif (trim($if_data['dhcp']) === '1') {
-                $lan_config = "auto {$if_name}\n" .
-                    "iface {$if_name} inet dhcp\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_name}\n".
+                    "iface {$if_name} inet dhcp\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             } else {
                 if (empty($ipaddr)) {
@@ -449,13 +449,13 @@ 
                     echo "Caught exception: $ipaddr $subnet", $e->getMessage(), "\n";
                     continue;
                 }
-                $lan_config = "auto {$if_name}\n" .
-                    "iface {$if_name} inet static\n" .
-                    "address {$ipaddr}\n" .
-                    "netmask {$subnet}\n" .
-                    "gateway {$gateway}\n" .
-                    "dns-nameservers 127.0.0.1\n" .
-                    "{$routs_add}\n" .
+                $lan_config = "auto {$if_name}\n".
+                    "iface {$if_name} inet static\n".
+                    "address {$ipaddr}\n".
+                    "netmask {$subnet}\n".
+                    "gateway {$gateway}\n".
+                    "dns-nameservers 127.0.0.1\n".
+                    "{$routs_add}\n".
                     "{$routs_rem}\n";
             }
             file_put_contents("/etc/network/interfaces.d/{$if_name}", $lan_config);
@@ -546,7 +546,7 @@ 
         $net_mask = explode(".", $net_mask);
 
         foreach ($net_mask as $oct_ect) {
-            $bits += strlen(str_replace("0", "", decbin((int)$oct_ect)));
+            $bits += strlen(str_replace("0", "", decbin((int) $oct_ect)));
         }
 
         return $bits;
@@ -609,7 +609,7 @@ 
         $data->hostname  = 'mikopbx';
         $data->domain    = '';
         $data->topology  = 'private';
-        $data->primarydns= '';
+        $data->primarydns = '';
         $data->save();
 
         return $data->toArray();
@@ -630,15 +630,15 @@ 
     public function hostnameConfigure(): void
     {
         $data       = Network::getHostName();
-        $hosts_conf = "127.0.0.1 localhost\n" .
+        $hosts_conf = "127.0.0.1 localhost\n".
             "127.0.0.1 {$data['hostname']}\n";
-        if ( ! empty($data['domain'])) {
+        if (!empty($data['domain'])) {
             $hosts_conf .= "127.0.0.1 {$data['hostname']}.{$data['domain']}\n";
         }
         Util::fileWriteContent('/etc/hosts', $hosts_conf);
 
         $hostnamePath = Util::which('hostname');
-        Processes::mwExec($hostnamePath . ' ' . escapeshellarg("{$data['hostname']}"));
+        Processes::mwExec($hostnamePath.' '.escapeshellarg("{$data['hostname']}"));
     }
 
     /**
@@ -652,12 +652,12 @@ 
 
         $pidFile = '/var/run/openvpn.pid';
         $pid     = Processes::getPidOfProcess('openvpn');
-        if ( ! empty($pid)) {
+        if (!empty($pid)) {
             // Завершаем процесс.
             $busyboxPath = Util::which('busybox');
             Processes::mwExec("{$busyboxPath} kill '$pid'");
         }
-        if ( ! empty($data)) {
+        if (!empty($data)) {
             $openvpnPath = Util::which('openvpn');
             Processes::mwExecBg("{$openvpnPath} --config /etc/openvpn.ovpn --writepid {$pidFile}", '/dev/null', 5);
         }
@@ -867,12 +867,12 @@ 
         if ($res === null) {
             return;
         }
-        if (empty($res->primarydns) && ! empty($data['primarydns'])) {
+        if (empty($res->primarydns) && !empty($data['primarydns'])) {
             $res->writeAttribute('primarydns', $data['primarydns']);
         } elseif (empty($res->secondarydns) && $res->primarydns !== $data['primarydns']) {
             $res->writeAttribute('secondarydns', $data['primarydns']);
         }
-        if (empty($res->secondarydns) && ! empty($data['secondarydns'])) {
+        if (empty($res->secondarydns) && !empty($data['secondarydns'])) {
             $res->writeAttribute('secondarydns', $data['secondarydns']);
         }
         $res->save();
@@ -915,7 +915,7 @@ 
     {
         // Настройка по умолчанию.
         $interface = trim(getenv('interface'));
-        if ( ! Util::isSystemctl()) {
+        if (!Util::isSystemctl()) {
             // Для MIKO LFS Edition.
             $busyboxPath = Util::which('busybox');
             Processes::mwExec("{$busyboxPath} ifconfig $interface 192.168.2.1 netmask 255.255.255.0");

src/Core/System/BeanstalkClient.php

Spacing +11 added lines, -11 removed lines

@@ -48,7 +48,7 @@ 
     {
         $config = $this->di->get('config')->beanstalk;
         $port   = $config->port;
-        if ( ! empty($this->port) && is_numeric($this->port)) {
+        if (!empty($this->port) && is_numeric($this->port)) {
             $port = $this->port;
         }
 
@@ -102,7 +102,7 @@ 
                 $this->queue->delete($job);
             }
         } catch (Throwable $exception) {
-            Util::sysLogMsg(__METHOD__, 'Exception: ' . $exception->getMessage());
+            Util::sysLogMsg(__METHOD__, 'Exception: '.$exception->getMessage());
             if ($job !== null) {
                 $this->queue->bury($job);
             }
@@ -134,7 +134,7 @@ 
     ): Job {
         $tube = str_replace("\\", '-', $tube);
         // Change tube
-        if ( ! empty($tube) && $this->tube !== $tube) {
+        if (!empty($tube) && $this->tube !== $tube) {
             $this->queue->useTube($tube);
         }
         $job_data = serialize($job_data);
@@ -159,10 +159,10 @@ 
                 $queueStats = $this->queue->stats()->getArrayCopy();
 
                 // Delete buried jobs
-                $countBuried=$queueStats['current-jobs-buried'];
+                $countBuried = $queueStats['current-jobs-buried'];
                 while ($job = $this->queue->peekBuried()) {
                     $countBuried--;
-                    if ($countBuried<0){
+                    if ($countBuried < 0) {
                         break;
                     }
                     $id = $job->getId();
@@ -171,23 +171,23 @@ 
                 }
 
                 // Delete outdated jobs
-                $countReady=$queueStats['current-jobs-ready'];
+                $countReady = $queueStats['current-jobs-ready'];
                 while ($job = $this->queue->peekReady()) {
                     $countReady--;
-                    if ($countReady<0){
+                    if ($countReady < 0) {
                         break;
                     }
                     $id = $job->getId();
                     $jobStats = $this->queue->statsJob($job)->getArrayCopy();
-                    $age                   = (int)$jobStats['age'];
-                    $expectedTimeToExecute = (int)$jobStats['ttr'] * 2;
+                    $age                   = (int) $jobStats['age'];
+                    $expectedTimeToExecute = (int) $jobStats['ttr'] * 2;
                     if ($age > $expectedTimeToExecute) {
                         $this->queue->delete($job);
                         Util::sysLogMsg(__METHOD__, "Deleted outdated job with ID {$id} from {$tube}");
                     }
                 }
             } catch (Throwable $exception) {
-                Util::sysLogMsg(__METHOD__, 'Exception: ' . $exception->getMessage());
+                Util::sysLogMsg(__METHOD__, 'Exception: '.$exception->getMessage());
             }
         }
     }
@@ -220,7 +220,7 @@ 
         try {
             $job = $this->queue->reserveWithTimeout($timeout);
         } catch (Throwable $exception) {
-            Util::sysLogMsg(__METHOD__, 'Exception: ' . $exception->getMessage());
+            Util::sysLogMsg(__METHOD__, 'Exception: '.$exception->getMessage());
         }
 
         if ($job === null) {

src/Core/System/Processes.php

Spacing +7 added lines, -7 removed lines

@@ -27,7 +27,7 @@ 
     {
         $killallPath = Util::which('killall');
 
-        return self::mwExec($killallPath . ' ' . escapeshellarg($procName));
+        return self::mwExec($killallPath.' '.escapeshellarg($procName));
     }
 
     /**
@@ -42,7 +42,7 @@ 
     public static function mwExec($command, &$outArr = null, &$retVal = null): int
     {
         $retVal = 0;
-        $outArr   = [];
+        $outArr = [];
         $di     = Di::getDefault();
 
         if ($di !== null && $di->getShared('config')->path('core.debugMode')) {
@@ -68,7 +68,7 @@ 
         $rmPath    = Util::which('rm');
         $sleepPath = Util::which('sleep');
         if ($sleep_time > 0) {
-            $filename = '/tmp/' . time() . '_noop.sh';
+            $filename = '/tmp/'.time().'_noop.sh';
             file_put_contents($filename, "{$sleepPath} {$sleep_time}; {$command}; {$rmPath} -rf {$filename}");
             $noop_command = "{$nohupPath} {$shPath} {$filename} > {$out_file} 2>&1 &";
         } else {
@@ -142,10 +142,10 @@ 
      * @param string $param
      * @param string $action
      */
-    public static function processPHPWorker(string $className, string $param = 'start', string $action='restart'): void
+    public static function processPHPWorker(string $className, string $param = 'start', string $action = 'restart'): void
     {
         $workerPath = Util::getFilePathByClassName($className);
-        if ( ! empty($workerPath)) {
+        if (!empty($workerPath)) {
             $command = "php -f {$workerPath}";
             $path_kill  = Util::which('kill');
             $path_nohup = Util::which('nohup');
@@ -238,8 +238,8 @@ 
 
         $name       = addslashes($name);
         $filter_cmd = '';
-        if ( ! empty($exclude)) {
-            $filter_cmd = "| $path_grep -v " . escapeshellarg($exclude);
+        if (!empty($exclude)) {
+            $filter_cmd = "| $path_grep -v ".escapeshellarg($exclude);
         }
         $out = [];
         self::mwExec(

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;
 
@@ -203,7 +203,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();
@@ -219,7 +219,7 @@ 
      */
     public static function sipReload():void
     {
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return;
         }
@@ -235,7 +235,7 @@ 
             Processes::mwExec("{$asteriskPath} -rx 'module reload acl'");
             Processes::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);
             // Завершаем каналы.
             Processes::mwExec("{$asteriskPath} -rx 'channel request hangup all'");
             usleep(500000);
@@ -248,7 +248,7 @@ 
      */
     public static function iaxReload(): void
     {
-        $iax    = new IAXConf();
+        $iax = new IAXConf();
         $iax->generateConfig();
         $asteriskPath = Util::which('asterisk');
         Processes::mwExec("{$asteriskPath} -rx 'iax2 reload'");
@@ -305,7 +305,7 @@ 
             'result' => 'ERROR',
         ];
 
-        if ( ! $this->di->getShared('registry')->booting) {
+        if (!$this->di->getShared('registry')->booting) {
             $this->stop();
         }
         /**
@@ -321,7 +321,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/System/Storage.php

Spacing +62 added lines, -62 removed lines

@@ -73,16 +73,16 @@ 
     public static function isStorageDisk($device): bool
     {
         $result = false;
-        if ( ! file_exists("{$device}")) {
+        if (!file_exists("{$device}")) {
             return $result;
         }
 
-        $tmp_dir = '/tmp/mnt_' . time();
+        $tmp_dir = '/tmp/mnt_'.time();
         Util::mwMkdir($tmp_dir);
         $out = [];
 
         $storage  = new Storage();
-        $uid_part = 'UUID=' . $storage->getUuid($device) . '';
+        $uid_part = 'UUID='.$storage->getUuid($device).'';
         $format   = $storage->getFsType($device);
         if ($format === '') {
             return false;
@@ -101,7 +101,7 @@ 
             Processes::mwExec("{$umountPath} {$device}");
         }
 
-        if ( ! self::isStorageDiskMounted($device)) {
+        if (!self::isStorageDiskMounted($device)) {
             Processes::mwExec("{$rmPath} -rf '{$tmp_dir}'");
         }
 
@@ -231,9 +231,9 @@ 
         $timeoutPath = Util::which('timeout');
         $sshfsPath   = Util::which('sshfs');
 
-        $command = "{$timeoutPath} -t 3 {$sshfsPath} -p {$port} -o nonempty -o password_stdin -o 'StrictHostKeyChecking=no' " .
-            "{$user}@{$host}:{$remout_dir} {$local_dir} << EOF\n" .
-            "{$pass}\n" .
+        $command = "{$timeoutPath} -t 3 {$sshfsPath} -p {$port} -o nonempty -o password_stdin -o 'StrictHostKeyChecking=no' ".
+            "{$user}@{$host}:{$remout_dir} {$local_dir} << EOF\n".
+            "{$pass}\n".
             "EOF\n";
         // file_put_contents('/tmp/sshfs_'.$host, $command);
         Processes::mwExec($command, $out);
@@ -265,19 +265,19 @@ 
 
         // Собираем строку подключения к ftp.
         $auth_line = '';
-        if ( ! empty($user)) {
-            $auth_line .= 'user="' . $user;
-            if ( ! empty($pass)) {
+        if (!empty($user)) {
+            $auth_line .= 'user="'.$user;
+            if (!empty($pass)) {
                 $auth_line .= ":{$pass}";
             }
             $auth_line .= '",';
         }
 
-        $connect_line = 'ftp://' . $host;
-        if ( ! empty($port)) {
+        $connect_line = 'ftp://'.$host;
+        if (!empty($port)) {
             $connect_line .= ":{$port}";
         }
-        if ( ! empty($remout_dir)) {
+        if (!empty($remout_dir)) {
             $connect_line .= "$remout_dir";
         }
 
@@ -303,10 +303,10 @@ 
      */
     public static function mkfs_disk($dev)
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             return false;
         }
         $dir = '';
@@ -341,7 +341,7 @@ 
             Processes::mwExec("/sbin/shell_functions.sh 'killprocesses' '$dir' -TERM 0");
             Processes::mwExec("{$umountPath} {$dir}");
         }
-        $result = ! self::isStorageDiskMounted($dir);
+        $result = !self::isStorageDiskMounted($dir);
         if ($result && file_exists($dir)) {
             // Если диск не смонтирован, то удаляем каталог.
             Processes::mwExec("{$rmPath} -rf '{$dir}'");
@@ -411,7 +411,7 @@ 
      */
     public static function statusMkfs($dev): string
     {
-        if ( ! file_exists($dev)) {
+        if (!file_exists($dev)) {
             $dev = "/dev/{$dev}";
         }
         $out      = [];
@@ -434,7 +434,7 @@ 
         }
         $config        = $di->getShared('config');
         $phpSessionDir = $config->path('www.phpSessionDir');
-        if ( ! empty($phpSessionDir)) {
+        if (!empty($phpSessionDir)) {
             $rmPath = Util::which('rm');
             Processes::mwExec("{$rmPath} -rf {$phpSessionDir}/*");
         }
@@ -450,7 +450,7 @@ 
         // Создание больщого файла для тестов.
         // head -c 1500MB /dev/urandom > /storage/usbdisk1/big_file.mp3
         foreach ($hdd as $disk) {
-            if ($disk['sys_disk'] === true && ! self::isStorageDiskMounted("{$disk['id']}4")) {
+            if ($disk['sys_disk'] === true && !self::isStorageDiskMounted("{$disk['id']}4")) {
                 // Это системный диск (4ый раздел). Он не смонтирован.
                 continue;
             }
@@ -474,7 +474,7 @@ 
                 Processes::processPHPWorker(WorkerRemoveOldRecords::class);
             }
 
-            if ( ! $need_alert) {
+            if (!$need_alert) {
                 continue;
             }
 
@@ -514,8 +514,8 @@ 
                 $m_size      = round(($disk_data[1] + $disk_data[2]) / 1024, 1);
                 $res_disks[] = [
                     'id'         => $disk_data[0],
-                    'size'       => "" . $m_size,
-                    'size_text'  => "" . $m_size . " Mb",
+                    'size'       => "".$m_size,
+                    'size_text'  => "".$m_size." Mb",
                     'vendor'     => 'Debian',
                     'mounted'    => '/storage/usbdisk1',
                     'free_space' => round($disk_data[2] / 1024, 1),
@@ -537,8 +537,8 @@ 
 
         $cf_disk   = '';
         $varEtcDir = $this->config->path('core.varEtcDir');
-        if (file_exists($varEtcDir . '/cfdevice')) {
-            $cf_disk = trim(file_get_contents($varEtcDir . '/cfdevice'));
+        if (file_exists($varEtcDir.'/cfdevice')) {
+            $cf_disk = trim(file_get_contents($varEtcDir.'/cfdevice'));
         }
 
         foreach ($disks as $disk) {
@@ -554,8 +554,8 @@ 
             $sys_disk = ($cf_disk == $disk);
 
             $mb_size = 0;
-            if (is_file("/sys/block/" . $disk . "/size")) {
-                $original_size = trim(file_get_contents("/sys/block/" . $disk . "/size"));
+            if (is_file("/sys/block/".$disk."/size")) {
+                $original_size = trim(file_get_contents("/sys/block/".$disk."/size"));
                 $original_size = ($original_size * 512 / 1024 / 1024);
                 $mb_size       = $original_size;
             }
@@ -662,14 +662,14 @@ 
     private function getVendorDisk($disk): string
     {
         $temp_vendor = [];
-        if (is_file("/sys/block/" . $disk . "/device/vendor")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/vendor"));
+        if (is_file("/sys/block/".$disk."/device/vendor")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/vendor"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
         }
-        if (is_file("/sys/block/" . $disk . "/device/model")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/model"));
+        if (is_file("/sys/block/".$disk."/device/model")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/model"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
@@ -677,8 +677,8 @@ 
         if (count($temp_vendor) == 0) {
             $temp_vendor[] = $disk;
         }
-        if (is_file("/sys/block/" . $disk . "/device/type")) {
-            $data = trim(file_get_contents("/sys/block/" . $disk . "/device/type"));
+        if (is_file("/sys/block/".$disk."/device/type")) {
+            $data = trim(file_get_contents("/sys/block/".$disk."/device/type"));
             if ($data != '') {
                 $temp_vendor[] = trim(str_replace(',', ' ', $data));
             }
@@ -704,7 +704,7 @@ 
         Processes::mwExec("{$dfPath} -m | {$grepPath} {$hdd} | {$awkPath} '{print $4}'", $out);
         $result = 0;
         foreach ($out as $res) {
-            if ( ! is_numeric($res)) {
+            if (!is_numeric($res)) {
                 continue;
             }
             $result += (1 * $res);
@@ -741,19 +741,19 @@ 
                 $path_size_info = $tmp_path;
             }
             if (empty($path_size_info)) {
-                $tmp_path = "/sys/block/" . substr($dev, 0, 3) . "/{$dev}/size";
+                $tmp_path = "/sys/block/".substr($dev, 0, 3)."/{$dev}/size";
                 if (file_exists($tmp_path)) {
                     $path_size_info = $tmp_path;
                 }
             }
 
-            if ( ! empty($path_size_info)) {
+            if (!empty($path_size_info)) {
                 $original_size = trim(file_get_contents($path_size_info));
                 $original_size = ($original_size * 512 / 1024 / 1024);
                 $mb_size       = $original_size;
             }
 
-            $tmp_dir = "/tmp/{$dev}_" . time();
+            $tmp_dir = "/tmp/{$dev}_".time();
             $out     = [];
 
             $fs           = null;
@@ -810,7 +810,7 @@ 
         }
         Util::mwMkdir($dir);
 
-        if ( ! file_exists($dir)) {
+        if (!file_exists($dir)) {
             Util::sysLogMsg('Storage', "Unable mount $dev $format to $dir. Unable create dir.");
 
             return false;
@@ -821,7 +821,7 @@ 
             Processes::mwExec("{$mountNtfs3gPath} /dev/{$dev} {$dir}", $out);
         } else {
             $storage   = new Storage();
-            $uid_part  = 'UUID=' . $storage->getUuid("/dev/{$dev}") . '';
+            $uid_part  = 'UUID='.$storage->getUuid("/dev/{$dev}").'';
             $mountPath = Util::which('mount');
             Processes::mwExec("{$mountPath} -t {$format} {$uid_part} {$dir}", $out);
         }
@@ -841,8 +841,8 @@ 
             unlink($storage_dev_file);
         }
 
-        if (file_exists($varEtcDir . '/cfdevice')) {
-            $cf_disk = trim(file_get_contents($varEtcDir . '/cfdevice'));
+        if (file_exists($varEtcDir.'/cfdevice')) {
+            $cf_disk = trim(file_get_contents($varEtcDir.'/cfdevice'));
         }
 
         $disks = $this->getDiskSettings();
@@ -856,18 +856,18 @@ 
                 // Если это системный диск, то пытаемся подключить раздел 4.
                 $dev = "{$disk['device']}4";
             }
-            if ( ! $this->hddExists($dev)) {
+            if (!$this->hddExists($dev)) {
                 // Диск не существует.
                 continue;
             }
-            if ($disk['media'] === '1' || ! file_exists($storage_dev_file)) {
+            if ($disk['media'] === '1' || !file_exists($storage_dev_file)) {
                 file_put_contents($storage_dev_file, "/storage/usbdisk{$disk['id']}");
                 $this->updateConfigWithNewMountPoint("/storage/usbdisk{$disk['id']}");
             }
 
-            $str_uid     = 'UUID=' . $this->getUuid($dev) . '';
+            $str_uid     = 'UUID='.$this->getUuid($dev).'';
             $format_p4   = $this->getFsType($dev);
-            $conf        .= "{$str_uid} /storage/usbdisk{$disk['id']} {$format_p4} async,rw 0 0\n";
+            $conf .= "{$str_uid} /storage/usbdisk{$disk['id']} {$format_p4} async,rw 0 0\n";
             $mount_point = "/storage/usbdisk{$disk['id']}";
             Util::mwMkdir($mount_point);
         }
@@ -979,11 +979,11 @@ 
         Util::mwMkdir('/storage');
         $chmodPath = Util::which('chmod');
         Processes::mwExec("{$chmodPath} 755 /storage");
-        if ( ! file_exists($varEtcDir . '/cfdevice')) {
+        if (!file_exists($varEtcDir.'/cfdevice')) {
             return;
         }
         $fstab     = '';
-        $file_data = file_get_contents($varEtcDir . '/cfdevice');
+        $file_data = file_get_contents($varEtcDir.'/cfdevice');
         $cf_disk   = trim($file_data);
         if ('' == $cf_disk) {
             return;
@@ -993,9 +993,9 @@ 
         $part3 = (strpos($cf_disk, 'mmcblk') !== false) ? "{$cf_disk}p3" : "{$cf_disk}3"; // Conf
 
 
-        $uid_part2 = 'UUID=' . $this->getUuid("/dev/{$part2}") . '';
+        $uid_part2 = 'UUID='.$this->getUuid("/dev/{$part2}").'';
         $format_p2 = $this->getFsType($part2);
-        $uid_part3 = 'UUID=' . $this->getUuid("/dev/{$part3}") . '';
+        $uid_part3 = 'UUID='.$this->getUuid("/dev/{$part3}").'';
         $format_p3 = $this->getFsType($part3);
 
         // $fstab .= "/dev/{$part1} /cf msdos ro 1 1\n"; // НЕ МОНТИРУЕМ!
@@ -1040,12 +1040,12 @@ 
             }
         }
 
-        if ( ! empty($path)) {
+        if (!empty($path)) {
             Util::mwMkdir($path);
         }
 
         $downloadCacheDir = appPath('sites/pbxcore/files/cache');
-        if ( ! $isLiveCd) {
+        if (!$isLiveCd) {
             Util::mwMkdir($downloadCacheDir);
             Util::createUpdateSymlink($this->config->path('www.downloadCacheDir'), $downloadCacheDir);
         }
@@ -1083,13 +1083,13 @@ 
     public function createAssetsSymlinks(): void
     {
         $jsCacheDir = appPath('sites/admin-cabinet/assets/js/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/js', $jsCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/js', $jsCacheDir);
 
         $cssCacheDir = appPath('sites/admin-cabinet/assets/css/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/css', $cssCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/css', $cssCacheDir);
 
         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
-        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir') . '/img', $imgCacheDir);
+        Util::createUpdateSymlink($this->config->path('adminApplication.assetsCacheDir').'/img', $imgCacheDir);
     }
 
     /**
@@ -1100,13 +1100,13 @@ 
         $cacheDirs   = [];
         $cacheDirs[] = $this->config->path('www.uploadDir');
         $cacheDirs[] = $this->config->path('www.downloadCacheDir');
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/js';
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/css';
-        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir') . '/img';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/js';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/css';
+        $cacheDirs[] = $this->config->path('adminApplication.assetsCacheDir').'/img';
         $cacheDirs[] = $this->config->path('adminApplication.voltCacheDir');
         $rmPath      = Util::which('rm');
         foreach ($cacheDirs as $cacheDir) {
-            if ( ! empty($cacheDir)) {
+            if (!empty($cacheDir)) {
                 Processes::mwExec("{$rmPath} -rf {$cacheDir}/*");
             }
         }
@@ -1216,7 +1216,7 @@ 
         $countBlock = $swapSize * $bs;
         $ddCmd      = Util::which('dd');
 
-        Util::sysLogMsg('Swap', 'make swap ' . $swapFile, LOG_INFO, LOG_INFO);
+        Util::sysLogMsg('Swap', 'make swap '.$swapFile, LOG_INFO, LOG_INFO);
         Processes::mwExec("{$ddCmd} if=/dev/zero of={$swapFile} bs={$bs} count={$countBlock}");
 
         $mkSwapCmd = Util::which('mkswap');
@@ -1224,7 +1224,7 @@ 
 
         $swapOnCmd = Util::which('swapon');
         $result    = Processes::mwExec("{$swapOnCmd} {$swapFile}");
-        Util::sysLogMsg('Swap', 'connect swap result: ' . $result, LOG_INFO, LOG_INFO);
+        Util::sysLogMsg('Swap', 'connect swap result: '.$result, LOG_INFO, LOG_INFO);
     }
 
     /**
@@ -1237,7 +1237,7 @@ 
         $size    = 0;
         $mntDir  = '';
         $mounted = self::isStorageDiskMounted('', $mntDir);
-        if ( ! $mounted) {
+        if (!$mounted) {
             return 0;
         }
         $hd = $this->getAllHdd(true);
@@ -1258,12 +1258,12 @@ 
      */
     public function saveDiskSettings($data, $id = '1'): void
     {
-        if ( ! is_array($data)) {
+        if (!is_array($data)) {
             return;
         }
         $disk_data = $this->getDiskSettings($id);
         if (count($disk_data) === 0) {
-            $uniqid           = strtoupper('STORAGE-DISK-' . md5(time()));
+            $uniqid           = strtoupper('STORAGE-DISK-'.md5(time()));
             $storage_settings = new StorageModel();
             foreach ($data as $key => $val) {
                 $storage_settings->writeAttribute($key, $val);

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

@@ -460,17 +460,17 @@
             $test_alert = '';
             if ($free < 5) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 5% of free space available.";
+                $test_alert = "the {$disk['id']} has less than 5% of free space available.";
             }
 
             if ($disk['free_space'] < 500) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 500MB of free space available.";
+                $test_alert = "the {$disk['id']} has less than 500MB of free space available.";
             }
 
             if ($disk['free_space'] < 100) {
                 $need_alert = true;
-                $test_alert = "The {$disk['id']} has less than 100MB of free space available. Old call records will be deleted.";
+                $test_alert = "the {$disk['id']} has less than 100MB of free space available. Old call records will be deleted.";
                 Processes::processPHPWorker(WorkerRemoveOldRecords::class);
             }