mikopbx / Core

src/PBXCoreREST/Controllers/System/PostController.php

Spacing +2 added lines, -2 removed lines

@@ -109,10 +109,10 @@
         $mohDir                = $di->getShared('config')->path('asterisk.mohdir');
         switch ($category) {
             case SoundFiles::CATEGORY_MOH:
-                $data['filename'] = "{$mohDir}/" . basename($data['temp_filename']);
+                $data['filename'] = "{$mohDir}/".basename($data['temp_filename']);
                 break;
             case SoundFiles::CATEGORY_CUSTOM:
-                $data['filename'] = "{$mediaDir}/" . basename($data['temp_filename']);
+                $data['filename'] = "{$mediaDir}/".basename($data['temp_filename']);
                 break;
             default:
                 $this->sendError(400, 'Category not set');

src/PBXCoreREST/Controllers/Files/PostController.php

Spacing +6 added lines, -6 removed lines

@@ -97,11 +97,11 @@ 
         if ($response !== false) {
             $response = json_decode($response, true);
             $filename = $response['data']['filename'] ?? '';
-            if ( ! file_exists($filename)) {
+            if (!file_exists($filename)) {
                 $response['messages'][] = 'Config file not found';
             } else {
                 $response['data']['filename'] = $filename;
-                $response['data']['content']  = mb_convert_encoding('' . file_get_contents($filename), 'UTF-8', 'UTF-8');
+                $response['data']['content']  = mb_convert_encoding(''.file_get_contents($filename), 'UTF-8', 'UTF-8');
                 unlink($filename);
             }
             $this->response->setPayloadSuccess($response);
@@ -115,7 +115,7 @@ 
      */
     public function uploadResumableAction(): void
     {
-        $data   = $this->request->getPost();
+        $data = $this->request->getPost();
         $data['result'] = 'ERROR';
 
         if ($this->request->hasFiles() > 0) {
@@ -127,7 +127,7 @@ 
                 'resumableTotalSize'   => $this->request->getPost('resumableTotalSize'),
             ];
             foreach ($this->request->getUploadedFiles() as $file) {
-                $data['files'][]= [
+                $data['files'][] = [
                     'file_path' => $file->getTempName(),
                     'file_size' => $file->getSize(),
                     'file_error'=> $file->getError(),
@@ -135,9 +135,9 @@ 
                     'file_type' => $file->getType()
                 ];
                 if ($file->getError()) {
-                    $data['data'] = 'error ' . $file->getError() . ' in file ' . $file->getTempName();
+                    $data['data'] = 'error '.$file->getError().' in file '.$file->getTempName();
                     $this->sendError(400, $data['data']);
-                    Util::sysLogMsg('UploadFile', 'error ' . $file->getError() . ' in file ' . $file->getTempName());
+                    Util::sysLogMsg('UploadFile', 'error '.$file->getError().' in file '.$file->getTempName());
                     return;
                 }
             }

src/PBXCoreREST/Lib/SysLogsManagementProcessor.php

Spacing +21 added lines, -21 removed lines

@@ -76,35 +76,35 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        $filename       = System::getLogDir() . '/' . $filename;
-        if ( ! file_exists($filename)) {
+        $filename       = System::getLogDir().'/'.$filename;
+        if (!file_exists($filename)) {
             $res->success    = false;
-            $res->messages[] = 'No access to the file ' . $filename;
+            $res->messages[] = 'No access to the file '.$filename;
         } else {
             $res->success = true;
             $head         = Util::which('head');
             $grep         = Util::which('grep');
             $tail         = Util::which('tail');
             $filter       = escapeshellarg($filter);
-            $offset       = (int)$offset;
-            $lines        = (int)$lines;
-            $linesPlusOffset = $lines+$offset;
+            $offset       = (int) $offset;
+            $lines        = (int) $lines;
+            $linesPlusOffset = $lines + $offset;
 
             $di          = Di::getDefault();
             $dirsConfig  = $di->getShared('config');
-            $filenameTmp = $dirsConfig->path('www.downloadCacheDir') . '/' . __FUNCTION__ . '_' . time() . '.log';
-            if (empty($filter)){
+            $filenameTmp = $dirsConfig->path('www.downloadCacheDir').'/'.__FUNCTION__.'_'.time().'.log';
+            if (empty($filter)) {
                 $cmd         = "{$tail} -n {$linesPlusOffset} {$filename}";
             } else {
                 $cmd         = "{$grep} -F {$filter} {$filename} | $tail -n {$linesPlusOffset}";
             }
-            if ($offset>0){
+            if ($offset > 0) {
                 $cmd .= " | {$head} -n {$lines}";
             }
             $cmd .= " > $filenameTmp";
 
             Util::mwExec("$cmd; chown www:www $filenameTmp");
-            $res->data['cmd']=$cmd;
+            $res->data['cmd'] = $cmd;
             $res->data['filename'] = $filenameTmp;
         }
 
@@ -162,7 +162,7 @@ 
         $systemInfoFile = "{$logDir}/system-information.log";
         file_put_contents($systemInfoFile, SysinfoManagementProcessor::prepareSysyinfoContent());
 
-        $futureFileName        = $temp_dir . '/temp-all-log-' . time() . '.zip';
+        $futureFileName        = $temp_dir.'/temp-all-log-'.time().'.zip';
         $res->data['filename'] = $futureFileName;
         $res->success          = true;
 
@@ -198,7 +198,7 @@ 
         $res->processor = __METHOD__;
 
         $progress_file = "{$resultFile}.progress";
-        if ( ! file_exists($progress_file)) {
+        if (!file_exists($progress_file)) {
             $res->messages[] = 'Archive does not exist. Try again!';
         } elseif (file_exists($progress_file) && file_get_contents($progress_file) === '100') {
             $uid          = Util::generateRandomString(36);
@@ -206,7 +206,7 @@ 
             $downloadLink = $di->getShared('config')->path('www.downloadCacheDir');
             $result_dir   = "{$downloadLink}/{$uid}";
             Util::mwMkdir($result_dir);
-            $link_name = 'MikoPBXLogs_' . basename($resultFile);
+            $link_name = 'MikoPBXLogs_'.basename($resultFile);
             Util::createUpdateSymlink($resultFile, "{$result_dir}/{$link_name}");
             Util::addRegularWWWRights("{$result_dir}/{$link_name}");
             $res->success          = true;
@@ -232,10 +232,10 @@ 
     {
         $res            = new PBXApiResult();
         $res->processor = __METHOD__;
-        $filename       = System::getLogDir() . '/' . $filename;
-        if ( ! file_exists($filename)) {
+        $filename       = System::getLogDir().'/'.$filename;
+        if (!file_exists($filename)) {
             $res->success    = false;
-            $res->messages[] = 'File does not exist ' . $filename;
+            $res->messages[] = 'File does not exist '.$filename;
         } else {
             $uid          = Util::generateRandomString(36);
             $di           = Di::getDefault();
@@ -276,7 +276,7 @@ 
                 continue;
             }
 
-            $relativePath             = str_ireplace($logDir . '/', '', $entry);
+            $relativePath             = str_ireplace($logDir.'/', '', $entry);
             $fileSizeKB               = ceil($fileSize / 1024);
             $filesList[$relativePath] =
                 [
@@ -313,11 +313,11 @@ 
                 continue;
             }
             //if current file ($d) is a directory, call scanDirRecursively
-            if (is_dir($dir . '/' . $d)) {
-                $list[] = self::scanDirRecursively($dir . '/' . $d);
+            if (is_dir($dir.'/'.$d)) {
+                $list[] = self::scanDirRecursively($dir.'/'.$d);
                 //otherwise, add the file to the list
-            } elseif (is_file($dir . '/' . $d) || is_link($dir . '/' . $d)) {
-                $list[] = $dir . '/' . $d;
+            } elseif (is_file($dir.'/'.$d) || is_link($dir.'/'.$d)) {
+                $list[] = $dir.'/'.$d;
             }
         }
 

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

Spacing +18 added lines, -18 removed lines

@@ -81,7 +81,7 @@ 
             'slin'  => 'Signed Linear PCM',
             'opus'  => 'Opus',
         ];
-        $codecs      = Codecs::find();
+        $codecs = Codecs::find();
         // Удалим лишние кодеки
         /** @var Codecs $codec */
         foreach ($codecs as $codec) {
@@ -89,10 +89,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'
                 );
             }
         }
@@ -107,7 +107,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();
         }
@@ -121,7 +121,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) {
@@ -136,10 +136,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'
                 );
             }
         }
@@ -191,12 +191,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 (\Error $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();
@@ -209,12 +209,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;
         }
 
@@ -223,9 +223,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();
@@ -289,7 +289,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';
@@ -304,14 +304,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/Notifications.php

Spacing +7 added lines, -7 removed lines

@@ -77,7 +77,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);
@@ -89,14 +89,14 @@ 
             $mail->Subject = $subject;
             $mail->Body    = $message;
 
-            if ( ! $mail->send()) {
+            if (!$mail->send()) {
                 $messages[] = $mail->ErrorInfo;
             }
         } catch (\Exception $e) {
             $messages[] = $e->getMessage();
         }
 
-        if (count($messages)>0) {
+        if (count($messages) > 0) {
             Util::sysLogMsg('PHPMailer', implode(' ', $messages), LOG_ERR);
             return false;
         }
@@ -108,7 +108,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);
     }
 
     /**
@@ -121,10 +121,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/Workers/WorkerNotifyByEmail.php

Spacing +4 added lines, -4 removed lines

@@ -14,7 +14,7 @@ 
 
 class WorkerNotifyByEmail extends WorkerBase
 {
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
     /**
      * Entry point
      *
@@ -50,7 +50,7 @@ 
         $tmpArray = [];
         foreach ($data as $call) {
             $keyHash = $call['email'].$call['start'].$call['from_number'].$call['to_number'];
-            if(in_array($keyHash, $tmpArray, true)){
+            if (in_array($keyHash, $tmpArray, true)) {
                 continue;
             }
             $tmpArray[] = $keyHash;
@@ -58,7 +58,7 @@ 
              * 'language'
              * 'is_internal'
              */
-            if ( ! isset($emails[$call['email']])) {
+            if (!isset($emails[$call['email']])) {
                 $emails[$call['email']] = '';
             }
 
@@ -96,7 +96,7 @@ 
 
 // Start worker process
 $workerClassname = WorkerNotifyByEmail::class;
-$action = $argv[1]??'';
+$action = $argv[1] ?? '';
 if ($action === 'start') {
     cli_set_process_title($workerClassname);
     while (true) {

src/Core/Workers/WorkerBase.php

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

@@ -105,7 +105,7 @@
     {
         $pingTube = $this->makePingTubeName(static::class);
         if ($pingTube === $parameters['UserEvent']) {
-            $this->am->UserEvent("{$pingTube}Pong", []);
+            $this->am->UserEvent("{$pingTube}pong", []);
 
             return true;
         }

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
     {
         $activeProcesses = Util::getPidOfProcess(static::class, getmypid());
         if ($this->maxProc === 1) {
-            if ( ! empty($activeProcesses)) {
+            if (!empty($activeProcesses)) {
                 $killApp = Util::which('kill');
                 // Завершаем старый процесс.
                 Util::mwExec("{$killApp} {$activeProcesses}");
@@ -56,7 +56,7 @@ 
             $killApp   = Util::which('kill');
             // Завершим лишние
             while ($countProc >= 0) {
-                if ( ! isset($processes[$countProc])) {
+                if (!isset($processes[$countProc])) {
                     break;
                 }
                 // Завершаем старый процесс.
@@ -104,7 +104,7 @@ 
      */
     public function pingCallBack(BeanstalkClient $message): void
     {
-        $message->reply(json_encode($message->getBody() . ':pong'));
+        $message->reply(json_encode($message->getBody().':pong'));
     }
 
     /**

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 @@ 
             Util::mwExec("{$umountPath} {$device}");
         }
 
-        if ( ! self::isStorageDiskMounted($device)) {
+        if (!self::isStorageDiskMounted($device)) {
             Util::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);
         Util::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 @@ 
             Util::mwExec("/sbin/shell_functions.sh 'killprocesses' '$dir' -TERM 0");
             Util::mwExec("{$umountPath} {$dir}");
         }
-        $result = ! self::isStorageDiskMounted($dir);
+        $result = !self::isStorageDiskMounted($dir);
         if ($result && file_exists($dir)) {
             // Если диск не смонтирован, то удаляем каталог.
             Util::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');
             Util::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 @@ 
                 Util::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 @@ 
         Util::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 @@ 
             Util::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');
             Util::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');
         Util::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);
     }
 
     /**
@@ -1102,13 +1102,13 @@ 
         $cacheDirs[] = $this->config->path('www.downloadCacheDir');
         $cacheDirs[] = $this->config->path('www.managedCacheDir');
         $cacheDirs[] = $this->config->path('www.modelsCacheDir');
-        $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)) {
                 Util::mwExec("{$rmPath} -rf {$cacheDir}/*");
             }
         }
@@ -1218,7 +1218,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);
         Util::mwExec("{$ddCmd} if=/dev/zero of={$swapFile} bs={$bs} count={$countBlock}");
 
         $mkSwapCmd = Util::which('mkswap');
@@ -1226,7 +1226,7 @@ 
 
         $swapOnCmd = Util::which('swapon');
         $result    = Util::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);
     }
 
     /**
@@ -1239,7 +1239,7 @@ 
         $size    = 0;
         $mntDir  = '';
         $mounted = self::isStorageDiskMounted('', $mntDir);
-        if ( ! $mounted) {
+        if (!$mounted) {
             return 0;
         }
         $hd = $this->getAllHdd(true);
@@ -1260,12 +1260,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.";
                 Util::processPHPWorker(WorkerRemoveOldRecords::class);
             }
 

src/AdminCabinet/Controllers/NetworkController.php

Spacing +11 added lines, -11 removed lines

@@ -37,7 +37,7 @@ 
         $internetInterface = LanInterfaces::findFirstByInternet('1');
         if ($internetInterface === null) {
             $internetInterface = new LanInterfaces();
-            $internetInterface->id     = 1;
+            $internetInterface->id = 1;
         }
 
         // We will find additional interfaces which we can delete
@@ -60,7 +60,7 @@ 
      */
     public function saveAction(): void
     {
-        if ( ! $this->request->isPost()) {
+        if (!$this->request->isPost()) {
             return;
         }
 
@@ -125,9 +125,9 @@ 
                 case 'extipaddr':
                     if ($itIsInternetInterfce) {
                         if (array_key_exists($name, $data)) {
-                            $eth->$name = ($data['usenat'] === 'on') ? $data[$name] : $data['ipaddr_' . $eth->id];
+                            $eth->$name = ($data['usenat'] === 'on') ? $data[$name] : $data['ipaddr_'.$eth->id];
                         } else {
-                            $eth->$name = $data['ipaddr_' . $eth->id];
+                            $eth->$name = $data['ipaddr_'.$eth->id];
                         }
                     } else {
                         $eth->$name = '';
@@ -146,8 +146,8 @@ 
                     }
                     break;
                 case 'dhcp':
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = ($data['dhcp_' . $eth->id]) === 'on' ? '1' : '0';
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = ($data['dhcp_'.$eth->id]) === 'on' ? '1' : '0';
                     }
                     break;
                 case 'internet':
@@ -156,13 +156,13 @@ 
                 case 'ipaddr':
                 case 'subnet':
                     $eth->$name = '';
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = ($data['dhcp_' . $eth->id]) === 'on' ? '' : $data[$name . '_' . $eth->id];
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = ($data['dhcp_'.$eth->id]) === 'on' ? '' : $data[$name.'_'.$eth->id];
                     }
                     break;
                 case 'interface':
                     if ($eth->id === 0) {
-                        $eth->$name = LanInterfaces::findFirstById($data[$name . '_' . $eth->id])->interface;
+                        $eth->$name = LanInterfaces::findFirstById($data[$name.'_'.$eth->id])->interface;
                     }
                     break;
                 case 'domain':
@@ -177,8 +177,8 @@ 
                     }
                     break;
                 default:
-                    if (array_key_exists($name . '_' . $eth->id, $data)) {
-                        $eth->$name = $data[$name . '_' . $eth->id];
+                    if (array_key_exists($name.'_'.$eth->id, $data)) {
+                        $eth->$name = $data[$name.'_'.$eth->id];
                     }
             }
         }