mikopbx / Core

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/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

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

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);
     }
 
     /**
@@ -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)) {
                 Processes::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);
         Processes::mwExec("{$ddCmd} if=/dev/zero of={$swapFile} bs={$bs} count={$countBlock}");
 
         $mkSwapCmd = Util::which('mkswap');
@@ -1226,7 +1226,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);
     }
 
     /**
@@ -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);

src/Core/System/Util.php

Spacing +26 added lines, -26 removed lines

@@ -47,7 +47,7 @@ 
             }
             if (is_array($value)) {
                 array_unshift($value, ' ');
-                $result_config .= trim(implode("\n{$key} = ", $value)) . "\n";
+                $result_config .= trim(implode("\n{$key} = ", $value))."\n";
             } else {
                 $result_config .= "{$key} = {$value}\n";
             }
@@ -69,7 +69,7 @@ 
     public static function amiOriginate($peer_number, $peer_mobile, $dest_number): array
     {
         $am       = self::getAstManager('off');
-        $channel  = 'Local/' . $peer_number . '@internal-originate';
+        $channel  = 'Local/'.$peer_number.'@internal-originate';
         $context  = 'all_peers';
         $IS_ORGNT = self::generateRandomString();
         $variable = "_IS_ORGNT={$IS_ORGNT},pt1c_cid={$dest_number},_extenfrom1c={$peer_number},__peer_mobile={$peer_mobile},_FROM_PEER={$peer_number}";
@@ -336,10 +336,10 @@ 
     public static function trimExtensionForFile($filename, $delimiter = '.'): string
     {
         // Отсечем расширение файла.
-        $tmp_arr = explode((string)$delimiter, $filename);
+        $tmp_arr = explode((string) $delimiter, $filename);
         if (count($tmp_arr) > 1) {
             unset($tmp_arr[count($tmp_arr) - 1]);
-            $filename = implode((string)$delimiter, $tmp_arr);
+            $filename = implode((string) $delimiter, $tmp_arr);
         }
 
         return $filename;
@@ -418,7 +418,7 @@ 
      */
     public static function mwExec($command, &$outArr = null, &$retVal = null): int
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::mwExec($command, $outArr, $retVal);
     }
@@ -463,10 +463,10 @@ 
             $objects = scandir($dir);
             foreach ($objects as $object) {
                 if ($object != "." && $object != "..") {
-                    if (filetype($dir . "/" . $object) == "dir") {
-                        self::rRmDir($dir . "/" . $object);
+                    if (filetype($dir."/".$object) == "dir") {
+                        self::rRmDir($dir."/".$object);
                     } else {
-                        unlink($dir . "/" . $object);
+                        unlink($dir."/".$object);
                     }
                 }
             }
@@ -489,7 +489,7 @@ 
     public static function generateSslCert($options = null, $config_args_pkey = null, $config_args_csr = null): array
     {
         // Инициализация настроек.
-        if ( ! $options) {
+        if (!$options) {
             $options = [
                 "countryName"            => 'RU',
                 "stateOrProvinceName"    => 'Moscow',
@@ -501,11 +501,11 @@ 
             ];
         }
 
-        if ( ! $config_args_csr) {
+        if (!$config_args_csr) {
             $config_args_csr = ['digest_alg' => 'sha256'];
         }
 
-        if ( ! $config_args_pkey) {
+        if (!$config_args_pkey) {
             $config_args_pkey = [
                 "private_key_bits" => 2048,
                 "private_key_type" => OPENSSL_KEYTYPE_RSA,
@@ -593,12 +593,12 @@ 
             $arrPaths = explode(' ', $parameters);
             if (count($arrPaths) > 0) {
                 foreach ($arrPaths as $path) {
-                    if ( ! empty($path)
-                        && ! file_exists($path)
-                        && ! mkdir($path, 0755, true)
-                        && ! is_dir($path)) {
+                    if (!empty($path)
+                        && !file_exists($path)
+                        && !mkdir($path, 0755, true)
+                        && !is_dir($path)) {
                         $result = false;
-                        self::sysLogMsg('Util', 'Error on create folder ' . $path);
+                        self::sysLogMsg('Util', 'Error on create folder '.$path);
                     }
                     if ($addWWWRights) {
                         self::addRegularWWWRights($path);
@@ -672,7 +672,7 @@ 
             $row = trim($row);
             $pos = strpos($row, ']');
             if ($pos !== false && strpos($row, '[') === 0) {
-                $row = "\n" . substr($row, 0, $pos);
+                $row = "\n".substr($row, 0, $pos);
             }
         }
         unset($row);
@@ -684,7 +684,7 @@ 
         foreach ($sections as $section) {
             $data_rows    = explode("\n", trim($section));
             $section_name = trim($data_rows[0] ?? '');
-            if ( ! empty($section_name)) {
+            if (!empty($section_name)) {
                 unset($data_rows[0]);
                 $manual_data[$section_name] = [];
                 foreach ($data_rows as $row) {
@@ -744,7 +744,7 @@ 
             $reflection = new ReflectionClass($className);
             $filename   = $reflection->getFileName();
         } catch (ReflectionException $exception) {
-            self::sysLogMsg('Util', 'Error ' . $exception->getMessage());
+            self::sysLogMsg('Util', 'Error '.$exception->getMessage());
         }
 
         return $filename;
@@ -761,7 +761,7 @@ 
      */
     public static function getPidOfProcess($name, $exclude = ''): string
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::getPidOfProcess($name, $exclude);
     }
@@ -781,7 +781,7 @@ 
      */
     public static function processWorker($cmd, $param, $proc_name, $action, $out_file = '/dev/null')
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::processWorker($cmd, $param, $proc_name, $action, $out_file);
     }
@@ -799,7 +799,7 @@ 
         string $param = 'start',
         string $action = 'restart'
     ): void {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::processPHPWorker($className, $param, $action);
     }
 
@@ -813,7 +813,7 @@ 
      */
     public static function killByName($procName): ?int
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
 
         return Processes::killByName($procName);
     }
@@ -828,7 +828,7 @@ 
      */
     public static function mwExecBg($command, $out_file = '/dev/null', $sleep_time = 0): void
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::mwExecBg($command, $out_file, $sleep_time);
     }
 
@@ -842,7 +842,7 @@ 
      */
     public static function mwExecBgWithTimeout($command, $timeout = 4, $logname = '/dev/null'): void
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::mwExecBgWithTimeout($command, $timeout, $logname);
     }
 
@@ -856,7 +856,7 @@ 
      */
     public static function mwExecCommands($arr_cmds, &$out = [], $logname = ''): void
     {
-        self::sysLogMsg('Util', 'Deprecated call ' . __METHOD__ . ' from ' . static::class);
+        self::sysLogMsg('Util', 'Deprecated call '.__METHOD__.' from '.static::class);
         Processes::mwExecCommands($arr_cmds, $out, $logname);
     }
 

src/Core/System/Configs/NatsConf.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
      */
     public static function logRotate(): void
     {
-        $log_dir = System::getLogDir() . '/nats';
+        $log_dir = System::getLogDir().'/nats';
         $gnatsdPath = Util::which('gnatsd');
         $pid     = Processes::getPidOfProcess($gnatsdPath, 'custom_modules');
         $max_size = 1;
@@ -63,13 +63,13 @@ 
         if (Util::mFileSize("{$log_dir}/gnatsd.log") > $mb10) {
             $options = '-f';
         }
-        $di     = Di::getDefault();
-        if ($di !== null){
+        $di = Di::getDefault();
+        if ($di !== null) {
             $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
         } else {
             $varEtcDir = '/var/etc';
         }
-        $path_conf  = $varEtcDir . '/gnatsd_logrotate.conf';
+        $path_conf = $varEtcDir.'/gnatsd_logrotate.conf';
         file_put_contents($path_conf, $text_config);
         if (file_exists("{$log_dir}/gnatsd.log")) {
             $logrotatePath = Util::which('logrotate');
@@ -85,7 +85,7 @@ 
         $confdir = '/etc/nats';
         Util::mwMkdir($confdir);
 
-        $logdir = System::getLogDir() . '/nats';
+        $logdir = System::getLogDir().'/nats';
         Util::mwMkdir($logdir);
 
         $tempDir = $this->di->getShared('config')->path('core.tempDir');
@@ -106,7 +106,7 @@ 
             'sessions_path'    => $sessionsDir,
             'log_file'         => "{$logdir}/gnatsd.log",
         ];
-        $config   = '';
+        $config = '';
         foreach ($settings as $key => $val) {
             $config .= "{$key}: {$val} \n";
         }

src/Core/System/Configs/SyslogConf.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
     {
         $syslog_file = '/var/log/messages';
         $log_file    = self::getSyslogFile();
-        if ( ! file_exists($syslog_file)) {
+        if (!file_exists($syslog_file)) {
             file_put_contents($syslog_file, '');
         }
         $syslogdPath = Util::which('syslogd');
@@ -32,9 +32,9 @@ 
         $logreadPath = Util::which('logread');
         $killPath = Util::which('kill');
         $pid = Processes::getPidOfProcess($syslogdPath);
-        if ( ! empty($pid)) {
+        if (!empty($pid)) {
             $options = file_exists($log_file) ? '>' : '';
-            Processes::mwExec("{$busyboxPath} {$logreadPath} 2> /dev/null >" . $options . $log_file);
+            Processes::mwExec("{$busyboxPath} {$logreadPath} 2> /dev/null >".$options.$log_file);
             // Завершаем процесс.
             Processes::mwExec("{$busyboxPath} {$killPath} '$pid'");
         }
@@ -49,7 +49,7 @@ 
      */
     public static function getSyslogFile(): string
     {
-        $logdir = System::getLogDir() . '/system';
+        $logdir = System::getLogDir().'/system';
         Util::mwMkdir($logdir);
         return "$logdir/messages";
     }

src/Core/System/Configs/BeanstalkConf.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
         while (true) {
             $pid = Processes::getPidOfProcess('beanstalkd');
             if (empty($pid)) {
-                Util::echoWithSyslog(' - Wait for start beanstalkd deamon ...' . PHP_EOL);
+                Util::echoWithSyslog(' - Wait for start beanstalkd deamon ...'.PHP_EOL);
                 sleep(2);
             } else {
                 break;

src/Core/System/Configs/SSHConf.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     public function configure()
     {
         $lofFile = '/var/log/lastlog';
-        if(!file_exists($lofFile)){
+        if (!file_exists($lofFile)) {
             file_put_contents($lofFile, '');
         }
         $dropbear_dir = '/etc/dropbear';
@@ -47,7 +47,7 @@ 
         $dropbearkeyPath = Util::which('dropbearkey');
         $dropbearPath = Util::which('dropbear');
         foreach ($keytypes as $keytype => $db_key) {
-            $res_keyfilepath = "{$dropbear_dir}/dropbear_" . $keytype . "_host_key";
+            $res_keyfilepath = "{$dropbear_dir}/dropbear_".$keytype."_host_key";
             $key             = $this->mikoPBXConfig->getGeneralSettings($db_key);
             $key             = (isset($key) && is_string($key)) ? trim($key) : "";
             if (strlen($key) > 100) {
@@ -55,7 +55,7 @@ 
                 file_put_contents($res_keyfilepath, base64_decode($key));
             }
             // If key not exists, we will generate and store new one into file and database
-            if ( ! file_exists($res_keyfilepath)) {
+            if (!file_exists($res_keyfilepath)) {
                 // Generation
                 Processes::mwExec("{$dropbearkeyPath} -t $keytype -f $res_keyfilepath");
                 // Storing

src/Core/System/Configs/NginxConf.php

Spacing +16 added lines, -16 removed lines

@@ -64,17 +64,17 @@ 
             echo $killPath.' -QUIT '.$pid."\n";
         }
         $timeStart = time();
-        while (true){
-            if(time() - $timeStart > 20){
+        while (true) {
+            if (time() - $timeStart > 20) {
                 break;
             }
             usleep(50000);
             $pid = Processes::getPidOfProcess('nginx: master process');
-            if($pid !== ''){
+            if ($pid !== '') {
                 continue;
             }
             $result = Processes::mwExec($NginxPath);
-            if($result === 0){
+            if ($result === 0) {
                 break;
             }
             echo "RESULT -- $result\n";
@@ -112,9 +112,9 @@ 
 
         $RedirectToHttps = $this->mikoPBXConfig->getGeneralSettings('RedirectToHttps');
         if ($RedirectToHttps === '1' && $not_ssl === false) {
-            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {' . PHP_EOL
-                . '        ' . 'return 301 https://$host:' . $WEBHTTPSPort . '$request_uri;' . PHP_EOL
-                . '       }' . PHP_EOL;
+            $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {'.PHP_EOL
+                . '        '.'return 301 https://$host:'.$WEBHTTPSPort.'$request_uri;'.PHP_EOL
+                . '       }'.PHP_EOL;
             $config    = str_replace('include mikopbx/locations/*.conf;', $conf_data, $config);
         }
         file_put_contents($httpConfigFile, $config);
@@ -124,8 +124,8 @@ 
         $WEBHTTPSPrivateKey = $this->mikoPBXConfig->getGeneralSettings('WEBHTTPSPrivateKey');
         if (
             $not_ssl === false
-            && ! empty($WEBHTTPSPublicKey)
-            && ! empty($WEBHTTPSPrivateKey)
+            && !empty($WEBHTTPSPublicKey)
+            && !empty($WEBHTTPSPrivateKey)
         ) {
             $public_filename  = '/etc/ssl/certs/nginx.crt';
             $private_filename = '/etc/ssl/private/nginx.key';
@@ -140,7 +140,7 @@ 
 
         // Test work
         $currentConfigIsGood = $this->testCurrentNginxConfig();
-        if ($level < 1 && ! $currentConfigIsGood) {
+        if ($level < 1 && !$currentConfigIsGood) {
             ++$level;
             Util::sysLogMsg('nginx', 'Failed test config file. SSL will be disable...');
             $this->generateConf(true, $level);
@@ -169,9 +169,9 @@ 
      */
     public function generateModulesConf(): void
     {
-        $locationsPath     = self::MODULES_LOCATIONS_PATH;
-        if (!is_dir($locationsPath)){
-            Util::mwMkdir($locationsPath,true);
+        $locationsPath = self::MODULES_LOCATIONS_PATH;
+        if (!is_dir($locationsPath)) {
+            Util::mwMkdir($locationsPath, true);
         }
         $additionalModules = $this->di->getShared('pbxConfModules');
         $rmPath            = Util::which('rm');
@@ -179,12 +179,12 @@ 
         foreach ($additionalModules as $appClass) {
             if (method_exists($appClass, 'createNginxLocations')) {
                 $locationContent = $appClass->createNginxLocations();
-                if ( ! empty($locationContent)) {
+                if (!empty($locationContent)) {
                     $confFileName = "{$locationsPath}/{$appClass->moduleUniqueId}.conf";
                     file_put_contents($confFileName, $locationContent);
-                    if ( ! $this->testCurrentNginxConfig()) {
+                    if (!$this->testCurrentNginxConfig()) {
                         Processes::mwExec("{$rmPath} {$confFileName}");
-                        Util::sysLogMsg('nginx', 'Failed test config file for module' . $appClass->moduleUniqueId);
+                        Util::sysLogMsg('nginx', 'Failed test config file for module'.$appClass->moduleUniqueId);
                     }
                 }
             }