mikopbx / Core

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/Core/System/BeanstalkClient.php

Spacing +13 added lines, -13 removed lines

@@ -37,7 +37,7 @@ 
      */
     public function __construct($tube = 'default', $port = '')
     {
-        $this->tube        = str_replace("\\", '-', $tube);;
+        $this->tube        = str_replace("\\", '-', $tube); ;
         $this->job_options = ['priority' => 250, 'delay' => 0, 'ttr' => 3600];
         $this->port = $port;
         $this->reconnect();
@@ -50,7 +50,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;
         }
 
@@ -128,7 +128,7 @@ 
     {
         $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);
@@ -180,9 +180,9 @@ 
         }
 
         // Processing job over callable function attached in $this->subscribe
-        if(json_decode($job->getData(), true) !==null){
-            $mData =  $job->getData();
-        }else{
+        if (json_decode($job->getData(), true) !== null) {
+            $mData = $job->getData();
+        } else {
             $mData = unserialize($job->getData(), [false]);
         }
         $this->message = $mData;
@@ -262,28 +262,28 @@ 
     /**
      * Drops orphaned tasks
      */
-    public function cleanTube(){
+    public function cleanTube() {
         $tubes = $this->queue->listTubes();
-        foreach ($tubes as $tube){
-            if(strpos($tube, "INBOX_") !== 0){
+        foreach ($tubes as $tube) {
+            if (strpos($tube, "INBOX_") !== 0) {
                 continue;
             }
             try {
                 $statData = $this->queue->statsTube($tube)->getArrayCopy();
                 $watching = $statData['current-watching'];
-                if($watching !== '0'){
+                if ($watching !== '0') {
                     continue;
                 }
                 // Нужно удалить все Jobs.
                 $this->queue->watch($tube);
-                while (true){
+                while (true) {
                     $job = $this->queue->reserveWithTimeout(1);
-                    if($job === null){
+                    if ($job === null) {
                         break;
                     }
                     $this->queue->delete($job);
                 }
-            }catch (\Exception $e){
+            } catch (\Exception $e) {
                 continue;
             }
 

Braces +5 added lines, -5 removed lines

@@ -84,8 +84,7 @@ 
         $job_data,
         int $timeout = 10,
         int $priority = PheanstalkInterface::DEFAULT_PRIORITY
-    )
-    {
+    ) {
         $this->message = false;
         $inbox_tube    = uniqid('INBOX_', true);
         $this->queue->watch($inbox_tube);
@@ -186,7 +185,7 @@ 
         // Processing job over callable function attached in $this->subscribe
         if(json_decode($job->getData(), true) !==null){
             $mData =  $job->getData();
-        }else{
+        } else{
             $mData = unserialize($job->getData(), [false]);
         }
         $this->message = $mData;
@@ -266,7 +265,8 @@ 
     /**
      * Drops orphaned tasks
      */
-    public function cleanTube(){
+    public function cleanTube()
+    {
         $tubes = $this->queue->listTubes();
         foreach ($tubes as $tube){
             if(strpos($tube, "INBOX_") !== 0){
@@ -287,7 +287,7 @@ 
                     }
                     $this->queue->delete($job);
                 }
-            }catch (\Exception $e){
+            } catch (\Exception $e){
                 continue;
             }
 

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

src/Common/Providers/LicenseProvider.php

Spacing +3 added lines, -3 removed lines

@@ -49,11 +49,11 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function() {
                 $provider = null;
                 try {
-                    $provider =  new License('http://127.0.0.1:8223');
-                } catch (Error $exception){
+                    $provider = new License('http://127.0.0.1:8223');
+                } catch (Error $exception) {
                     Util::sysLogMsg(__CLASS__, $exception);
                 }
                 return $provider;

Braces +2 added lines, -1 removed lines

@@ -49,7 +49,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 $provider = null;
                 try {
                     $provider =  new License('http://127.0.0.1:8223');