mikopbx / Core

src/Core/System/Configs/IptablesConf.php

Spacing +5 added lines, -5 removed lines

@@ -85,12 +85,12 @@ 
                 file_put_contents('/etc/iptables/iptables.mikopbx', implode("\n", $arr_command));
                 file_put_contents(
                     '/etc/iptables/iptables.mikopbx',
-                    "\n" . implode("\n", $arr_commands_custom),
+                    "\n".implode("\n", $arr_commands_custom),
                     FILE_APPEND
                 );
                 file_put_contents(
                     '/etc/iptables/iptables.mikopbx',
-                    "\n" . $dropCommand,
+                    "\n".$dropCommand,
                     FILE_APPEND
                 );
                 $systemctlPath = Util::which('systemctl');
@@ -135,7 +135,7 @@ 
     {
         $data_port = '';
         if (trim($dport) !== '') {
-            $data_port = '--dport ' . $dport;
+            $data_port = '--dport '.$dport;
         }
         $other_data = trim($other_data);
 
@@ -168,9 +168,9 @@ 
                 continue;
             }
             $other_data = "-p {$rule->protocol}";
-            $other_data .= ($network_filter === null) ? '' : ' -s ' . $network_filter->permit;
+            $other_data .= ($network_filter === null) ? '' : ' -s '.$network_filter->permit;
             if ($rule->protocol === 'icmp') {
-                $port       = '';
+                $port = '';
                 $other_data .= ' --icmp-type echo-request';
             }
 

src/Core/Asterisk/AsteriskManager.php

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

@@ -166,7 +166,7 @@
             } elseif (
                 'event' === $type
                 && $parameters['Event'] === 'UserEvent'
-                && "{$pingTube}Pong" === $parameters['UserEvent']) {
+                && "{$pingTube}pong" === $parameters['UserEvent']) {
                 // Ответ получен.
                 $result = true;
                 break;

Braces +7 added lines, -5 removed lines

@@ -338,7 +338,8 @@ 
      * Читает данные из сокета. Если возникает ошибка возвращает ее.
      * @return array
      */
-    private function getDataFromSocket() {
+    private function getDataFromSocket()
+    {
         $response = [];
         if(!is_resource($this->socket)){
             $response['error'] = 'Socket not init.';
@@ -349,11 +350,11 @@ 
             if($resultFgets !== false){
                 $buffer = trim($resultFgets);
                 $response['data']  = $buffer;
-            }else{
+            } else{
                 $response['error'] = 'Read data error.';
             }
 
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $response['error'] = $e->getMessage();
         }
 
@@ -364,7 +365,8 @@ 
      * Читает данные из сокета
      * @return string
      */
-    private function getStringDataFromSocket() {
+    private function getStringDataFromSocket()
+    {
         $response = $this->getDataFromSocket();
         return $response['data'] ?? '';
     }
@@ -384,7 +386,7 @@ 
             if($resultWrite === false){
                 $result = false;
             }
-        }catch (\Exception $e){
+        } catch (\Exception $e){
             $result = false;
         }
         return $result;

Spacing +53 added lines, -53 removed lines

@@ -88,9 +88,9 @@ 
     public function __construct($config = null, $optconfig = [])
     {
         // load config
-        if ( !is_null($config) && file_exists($config)) {
+        if (!is_null($config) && file_exists($config)) {
             $arrData = parse_ini_file($config, true);
-            $this->config = ($arrData === false)?[]:$arrData;
+            $this->config = ($arrData === false) ? [] : $arrData;
         }
 
         // If optconfig is specified, stuff vals and vars into 'asmanager' config array.
@@ -99,16 +99,16 @@ 
         }
 
         // add default values to config for uninitialized values
-        if ( ! isset($this->config['asmanager']['server'])) {
+        if (!isset($this->config['asmanager']['server'])) {
             $this->config['asmanager']['server'] = 'localhost';
         }
-        if ( ! isset($this->config['asmanager']['port'])) {
+        if (!isset($this->config['asmanager']['port'])) {
             $this->config['asmanager']['port'] = 5038;
         }
-        if ( ! isset($this->config['asmanager']['username'])) {
+        if (!isset($this->config['asmanager']['username'])) {
             $this->config['asmanager']['username'] = 'phpagi';
         }
-        if ( ! isset($this->config['asmanager']['secret'])) {
+        if (!isset($this->config['asmanager']['secret'])) {
             $this->config['asmanager']['secret'] = 'phpagi';
         }
     }
@@ -135,7 +135,7 @@ 
             $req .= "$var: $val\r\n";
         }
         $req .= "\r\n";
-        if ( ! is_resource($this->socket)) {
+        if (!is_resource($this->socket)) {
             return [];
         }
         $this->sendDataToSocket($req);
@@ -149,14 +149,14 @@ 
         do {
             $type       = '';
             $parameters = [];
-            if ( ! is_resource($this->socket)) {
+            if (!is_resource($this->socket)) {
                 return false;
             }
             $buffer = $this->getStringDataFromSocket();
             while (!empty($buffer)) {
                 $a = strpos($buffer, ':');
                 if ($a) {
-                    if ( ! count($parameters)) {
+                    if (!count($parameters)) {
                         $type = strtolower(substr($buffer, 0, $a));
                     }
                     $parameters[substr($buffer, 0, $a)] = substr($buffer, $a + 2);
@@ -179,7 +179,7 @@ 
                 // Таймаут ожидания.
                 break;
             }
-        } while ( ! $timeout);
+        } while (!$timeout);
 
         return $result;
     }
@@ -194,7 +194,7 @@ 
      */
     public function sendRequestTimeout($action, $parameters = [])
     {
-        if ( ! is_resource($this->socket) && !$this->connectDefault()) {
+        if (!is_resource($this->socket) && !$this->connectDefault()) {
             return [];
         }
         // Прописываем обязательные поля.
@@ -207,15 +207,15 @@ 
         $req .= "\r\n";
 
         $result = $this->sendDataToSocket($req);
-        if(!$result) {
+        if (!$result) {
             usleep(500000);
-            if($this->connectDefault()){
+            if ($this->connectDefault()) {
                 $result = $this->sendDataToSocket($req);
             }
         }
 
         $response = [];
-        if($result){
+        if ($result) {
             $response = $this->waitResponse(true);
         }
         return $response;
@@ -244,23 +244,23 @@ 
             $parameters = [];
             $response   = [];
 
-            if(!$this->waitResponseGetInitialData($response)) {
+            if (!$this->waitResponseGetInitialData($response)) {
                 return $parameters;
             }
-            $buffer = $response['data']??'';
+            $buffer = $response['data'] ?? '';
             while ($buffer !== '') {
                 $a = strpos($buffer, ':');
                 if ($a) {
                     $event_text = substr($buffer, $a + 2);
                     $this->waitResponseGetEventType($parameters, $buffer, $a, $type);
-                    $this->waitResponseReadFollowsPart($event_text,$parameters);
+                    $this->waitResponseReadFollowsPart($event_text, $parameters);
                     $this->waitResponseReadCompletePart($event_text, $parameters);
                     $parameters[substr($buffer, 0, $a)] = $event_text;
                 }
                 $buffer = $this->getStringDataFromSocket();
             }
             $this->waitResponseProcessResponse($type, $timeout, $allow_timeout, $parameters);
-        } while ($type !== 'response' && ! $timeout);
+        } while ($type !== 'response' && !$timeout);
 
         return $parameters;
     }
@@ -271,18 +271,18 @@ 
      * @return bool
      */
     private function waitResponseGetInitialData(& $response):bool{
-        if ( !is_resource($this->socket) && !$this->connectDefault()) {
+        if (!is_resource($this->socket) && !$this->connectDefault()) {
             return false;
         }
         $result = true;
         $response = $this->getDataFromSocket();
-        if(isset($response['error'])) {
+        if (isset($response['error'])) {
             usleep(500000);
-            if($this->connectDefault()){
+            if ($this->connectDefault()) {
                 $response = $this->getDataFromSocket();
             }
         }
-        if(isset($response['error'])) {
+        if (isset($response['error'])) {
             $result = false;
         }
         return $result;
@@ -317,7 +317,7 @@ 
      * @param $type
      */
     private function waitResponseGetEventType($parameters, $buffer, $a, & $type):void{
-        if ( ! count($parameters)) {
+        if (!count($parameters)) {
             $type = strtolower(substr($buffer, 0, $a));
         }
     }
@@ -328,13 +328,13 @@ 
      * @param $parameters
      */
     private function waitResponseReadFollowsPart($event_text, & $parameters):void{
-        if ( ($event_text === 'Follows') && !count($parameters)) {
+        if (($event_text === 'Follows') && !count($parameters)) {
             // A follows response means there is a miltiline field that follows.
             $parameters['data'] = '';
             $buff               = $this->getStringDataFromSocket();
             while (strpos($buff, '--END ') !== 0) {
                 $parameters['data'] .= $buff;
-                $buff               = $this->getStringDataFromSocket();
+                $buff = $this->getStringDataFromSocket();
             }
         }
     }
@@ -360,11 +360,11 @@ 
             'Following are Events for each Outbound registration'               => 'OutboundRegistrationDetailComplete',
             'A listing of Endpoints follows, presented as EndpointList events'  => 'EndpointListComplete'
         ];
-        $eventsAsNotArray = [ 'EndpointDetailComplete' ];
+        $eventsAsNotArray = ['EndpointDetailComplete'];
 
-        $endString = $settings[$event_text]??false;
-        if($endString !== false){
-            $NotArray = !in_array($endString,$eventsAsNotArray);
+        $endString = $settings[$event_text] ?? false;
+        if ($endString !== false) {
+            $NotArray = !in_array($endString, $eventsAsNotArray);
             $this->waitResponseGetSubData($parameters, $endString, $NotArray);
         }
     }
@@ -375,20 +375,20 @@ 
      */
     private function getDataFromSocket() {
         $response = [];
-        if(!is_resource($this->socket)){
+        if (!is_resource($this->socket)) {
             $response['error'] = 'Socket not init.';
             return $response;
         }
         try {
             $resultFgets = fgets($this->socket, 4096);
-            if($resultFgets !== false){
+            if ($resultFgets !== false) {
                 $buffer = trim($resultFgets);
                 $response['data']  = $buffer;
-            }else{
+            } else {
                 $response['error'] = 'Read data error.';
             }
 
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             $response['error'] = $e->getMessage();
         }
 
@@ -410,16 +410,16 @@ 
      * @return bool
      */
     private function sendDataToSocket($req) : bool{
-        if(!is_resource($this->socket)){
+        if (!is_resource($this->socket)) {
             return false;
         }
         $result = true;
         try {
             $resultWrite = fwrite($this->socket, $req);
-            if($resultWrite === false){
+            if ($resultWrite === false) {
                 $result = false;
             }
-        }catch (\Exception $e){
+        } catch (\Exception $e) {
             $result = false;
         }
         return $result;
@@ -427,7 +427,7 @@ 
 
     private function waitResponseGetSubData(&$parameters, $end_string = '', $event_as_array = true): void
     {
-        if ( ! is_array($parameters)) {
+        if (!is_array($parameters)) {
             $parameters = [];
         }
         if (empty($end_string)) {
@@ -439,7 +439,7 @@ 
             $value = '';
             $buff  = $this->getStringDataFromSocket().$value;
             $a_pos = strpos($buff, ':');
-            if ( ! $a_pos) {
+            if (!$a_pos) {
                 if (count($m) > 0) {
                     if ($event_as_array) {
                         $parameters['data'][$m['Event']][] = $m;
@@ -491,7 +491,7 @@ 
     {
         [$usec, $sec] = explode(" ", microtime());
 
-        return ((float)$usec + (float)$sec);
+        return ((float) $usec + (float) $sec);
     }
 
     /**
@@ -521,7 +521,7 @@ 
             while ($buffer !== '') {
                 $pos = strpos($buffer, ':');
                 if ($pos) {
-                    if ( ! count($parameters)) {
+                    if (!count($parameters)) {
                         $type = strtolower(substr($buffer, 0, $pos));
                     }
                     $parameters[substr($buffer, 0, $pos)] = substr($buffer, $pos + 2);
@@ -530,10 +530,10 @@ 
             }
             if ($type === '' && count($this->Ping()) === 0) {
                 $timeout = $allow_timeout;
-            } elseif (stripos($type, 'event')!==false ) {
+            } elseif (stripos($type, 'event') !== false) {
                 $this->processEvent($parameters);
             }
-        } while ( ! $timeout);
+        } while (!$timeout);
 
         return $parameters;
     }
@@ -572,7 +572,7 @@ 
         if (strpos($server, ':') !== false) {
             $c            = explode(':', $server);
             $this->server = $c[0];
-            $this->port   = (int)$c[1];
+            $this->port   = (int) $c[1];
         } else {
             $this->server = $server;
             $this->port   = $this->config['asmanager']['port'];
@@ -626,7 +626,7 @@ 
             $req .= "$var: $val\r\n";
         }
         $req .= "\r\n";
-        if ( ! is_resource($this->socket)) {
+        if (!is_resource($this->socket)) {
             return [];
         }
         $this->sendDataToSocket($req);
@@ -770,7 +770,7 @@ 
         if (null !== $channels) {
             foreach ($channels as $chan) {
                 if ($group === true) {
-                    if ( ! isset($chan['Linkedid'])) {
+                    if (!isset($chan['Linkedid'])) {
                         continue;
                     }
                     $channels_id[$chan['Linkedid']][] = $chan['Channel'];
@@ -931,7 +931,7 @@ 
         if ($format) {
             $parameters['Format'] = $format;
         }
-        if ( ! is_null($file)) {
+        if (!is_null($file)) {
             $parameters['Mix'] = ($mix) ? 'true' : 'false';
         }
 
@@ -1075,8 +1075,8 @@ 
             'ActionID'      => $actionid
         ];
         $keys = array_keys($parameters);
-        foreach ($keys as $key){
-            if(empty($parameters[$key])){
+        foreach ($keys as $key) {
+            if (empty($parameters[$key])) {
                 unset($parameters[$key]);
             }
         }
@@ -1348,7 +1348,7 @@ 
                     'Not in use' => 'OK',
                     'Busy'       => 'OK',
                 ];
-                $state       = $state_array[$peer['DeviceState']] ?? 'UNKNOWN';
+                $state = $state_array[$peer['DeviceState']] ?? 'UNKNOWN';
 
                 $peers[] = [
                     'id'    => $peer['ObjectName'],
@@ -1371,12 +1371,12 @@ 
         $res   = $this->sendRequestTimeout('SIPpeers');
         if (isset($res['data']) && $res['data'] != null && $res['data']['PeerEntry'] != null) {
             foreach ($res['data']['PeerEntry'] as $peer) {
-                if ( ! is_numeric($peer['ObjectName'])) {
+                if (!is_numeric($peer['ObjectName'])) {
                     continue;
                 }
                 // if ('Unmonitored' == $peer['Status']) continue;
                 $arr_status = explode(' ', $peer['Status']);
-                $peers[]    = ['id' => $peer['ObjectName'], 'state' => strtoupper($arr_status[0]),];
+                $peers[]    = ['id' => $peer['ObjectName'], 'state' => strtoupper($arr_status[0]), ];
             }
         }
 
@@ -1417,7 +1417,7 @@ 
         if (isset($res['data']['ContactStatusDetail'])) {
             $result = $res['data']['ContactStatusDetail'];
         }
-        $result['state'] = isset($result['URI']) && ! empty($result['URI']) ? 'OK' : 'UNKNOWN';
+        $result['state'] = isset($result['URI']) && !empty($result['URI']) ? 'OK' : 'UNKNOWN';
 
         return $result;
     }
@@ -1441,7 +1441,7 @@ 
     {
         $result    = [];
         $conf_data = $this->MeetmeList($conference);
-        if ( ! isset($conf_data['data']['MeetmeList'])) {
+        if (!isset($conf_data['data']['MeetmeList'])) {
             return $result;
         }
         foreach ($conf_data['data']['MeetmeList'] as $user_data) {

src/PBXCoreREST/Lib/SysinfoManagementProcessor.php

Spacing +59 added lines, -59 removed lines

@@ -63,7 +63,7 @@ 
         $res->success = true;
         $di           = Di::getDefault();
         $dirsConfig   = $di->getShared('config');
-        $filenameTmp  = $dirsConfig->path('www.downloadCacheDir') . '/' . __FUNCTION__ . '_' . time() . '.txt';
+        $filenameTmp  = $dirsConfig->path('www.downloadCacheDir').'/'.__FUNCTION__.'_'.time().'.txt';
 
         $content = self::prepareSysyinfoContent();
 
@@ -97,7 +97,7 @@ 
         $content .= self::getAsteriskInfo();
         $content .= self::getChangedConfigFiles();
         $content .= self::getCorruptedFiles();
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
 
         return $content;
     }
@@ -110,12 +110,12 @@ 
     public static function getDate(): string
     {
         $content    = '───────────────────────────────────────── Date ─────────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $datePath = Util::which('date');
         $ut         = [];
         Util::mwExec($datePath, $ut);
-        $content .= implode(PHP_EOL, $ut). PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= implode(PHP_EOL, $ut).PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -128,9 +128,9 @@ 
     {
         $version = PbxSettings::getValueByKey('PBXVersion');
         $content = '─────────────────────────────────────── PBXVersion ───────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
-        $content .= $version . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
+        $content .= $version.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -142,13 +142,13 @@ 
     public static function getUpTime(): string
     {
         $content    = '───────────────────────────────────────── Uptime ─────────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $uptimePath = Util::which('uptime');
         $ut         = [];
         Util::mwExec($uptimePath, $ut);
-        $uptime  = implode(PHP_EOL, $ut);
-        $content .= $uptime . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $uptime = implode(PHP_EOL, $ut);
+        $content .= $uptime.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -160,7 +160,7 @@ 
     public static function getCpu(): string
     {
         $content    = '───────────────────────────────────────── CPU load ───────────────────────────────────────';
-        $content    .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $ut         = [];
         $grepPath   = Util::which('grep');
         $mpstatPath = Util::which('mpstat');
@@ -172,8 +172,8 @@ 
             $rv = 100;
         }
 
-        $content .= round($rv, 2) . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= round($rv, 2).PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -185,7 +185,7 @@ 
     public static function getMemInfo(): string
     {
         $content  = '───────────────────────────────────────── MemInfo ────────────────────────────────────────';
-        $content  .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $out      = [];
         $catPath  = Util::which('cat');
         $grepPath = Util::which('grep');
@@ -193,19 +193,19 @@ 
         $freePath = Util::which('free');
         Util::mwExec("{$catPath} /proc/meminfo | {$grepPath} -C 0 'Inactive:' | {$awkPath} '{print $2}'", $out);
         $inactive = round((1 * implode($out)) / 1024, 2);
-        $content  .= "inactive = {$inactive}" . PHP_EOL;
+        $content .= "inactive = {$inactive}".PHP_EOL;
         Util::mwExec("{$catPath} /proc/meminfo | {$grepPath} -C 0 'MemFree:' | {$awkPath} '{print $2}'", $out);
         $free    = round((1 * implode($out)) / 1024, 2);
-        $content .= "free = {$free}" . PHP_EOL;
+        $content .= "free = {$free}".PHP_EOL;
         Util::mwExec("{$catPath} /proc/meminfo | {$grepPath} -C 0 'MemTotal:' | {$awkPath} '{print $2}'", $out);
         $total   = round((1 * implode($out)) / 1024, 2);
-        $content .= "total = {$total}" . PHP_EOL . PHP_EOL;
+        $content .= "total = {$total}".PHP_EOL.PHP_EOL;
 
         $content .= '────────────────────────────────────────── Free ─────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec($freePath, $out);
-        $content .= implode(PHP_EOL, $out) . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= implode(PHP_EOL, $out).PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -217,13 +217,13 @@ 
     private static function getStorageInfo(): string
     {
         $content = '─────────────────────────────────────────── df ───────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $dfPath  = Util::which('df');
         $out     = [];
         Util::mwExec("{$dfPath} -h", $out);
         $dfOut   = implode(PHP_EOL, $out);
-        $content .= $dfOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $dfOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -235,13 +235,13 @@ 
     private static function getIfconfigInfo(): string
     {
         $content      = '─────────────────────────────────────── ifconfig ──────────────────────────────────────';
-        $content      .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $ifconfigPath = Util::which('ifconfig');
         $out          = [];
         Util::mwExec($ifconfigPath, $out);
         $ifconfigOut = implode(PHP_EOL, $out);
-        $content     .= $ifconfigOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content     .= $ifconfigOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -253,13 +253,13 @@ 
     private static function getArpInfo(): string
     {
         $content = '─────────────────────────────────────────── arp ──────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $arpPath = Util::which('arp');
         $out     = [];
         Util::mwExec($arpPath, $out);
         $arpOut  = implode(PHP_EOL, $out);
-        $content .= $arpOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $arpOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -271,13 +271,13 @@ 
     private static function getRouteInfo(): string
     {
         $content   = '────────────────────────────────────────── route ─────────────────────────────────────────';
-        $content   .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $routePath = Util::which('route');
         $out       = [];
         Util::mwExec($routePath, $out);
         $routeOut = implode(PHP_EOL, $out);
-        $content  .= $routeOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content  .= $routeOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -289,13 +289,13 @@ 
     private static function getIptablesInfo(): string
     {
         $content      = '────────────────────────────────────────── iptables ──────────────────────────────────────';
-        $content      .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $iptablesPath = Util::which('iptables');
         $out          = [];
         Util::mwExec("{$iptablesPath} -S", $out);
         $iptablesOut = implode(PHP_EOL, $out);
-        $content     .= $iptablesOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content     .= $iptablesOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -307,17 +307,17 @@ 
     private static function getPingInfo(): string
     {
         $content  = '──────────────────────────────────────────── ping ────────────────────────────────────────';
-        $content  .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $pingPath = Util::which('ping');
         $out      = [];
         Util::mwExec("{$pingPath} 8.8.8.8 -w 2", $out);
         $pingOut = implode(PHP_EOL, $out);
         Util::mwExec("{$pingPath} ya.ru -w 2", $out);
         $ping2Out = implode(PHP_EOL, $out);
-        $content  .= $pingOut . PHP_EOL;
-        $content  .= PHP_EOL . PHP_EOL;
-        $content  .= $ping2Out . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content  .= $pingOut.PHP_EOL;
+        $content  .= PHP_EOL.PHP_EOL;
+        $content  .= $ping2Out.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -331,12 +331,12 @@ 
         $opensslPath = Util::which('openssl');
 
         $content = '─────────────────────────────────────── openssl ─────────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $out     = [];
         Util::mwExec("{$opensslPath} s_client -connect lic.miko.ru:443", $out);
         $opensslOut = implode(PHP_EOL, $out);
-        $content    .= $opensslOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $opensslOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -350,23 +350,23 @@ 
         $asteriskPath = Util::which('asterisk');
 
         $content = '────────────────────────────────── asterisk registrations ────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec("{$asteriskPath} -rx 'pjsip show registrations' ", $out);
         $asteriskOut = implode(PHP_EOL, $out);
-        $content     .= $asteriskOut . PHP_EOL;
+        $content .= $asteriskOut.PHP_EOL;
 
         $content .= '────────────────────────────────── asterisk endpoints ───────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec("{$asteriskPath} -rx 'pjsip show endpoints' ", $out);
         $asteriskOut = implode(PHP_EOL, $out);
-        $content     .= $asteriskOut . PHP_EOL;
+        $content .= $asteriskOut.PHP_EOL;
 
         $content .= '─────────────────────────────────── asterisk contacts ───────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         Util::mwExec("{$asteriskPath} -rx 'pjsip show contacts' ", $out);
         $asteriskOut = implode(PHP_EOL, $out);
-        $content     .= $asteriskOut . PHP_EOL;
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= $asteriskOut.PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -378,12 +378,12 @@ 
     private static function getChangedConfigFiles(): string
     {
         $content = '────────────────────────────────── Changed config files ─────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $files   = CustomFiles::find('mode!="none"');
         foreach ($files as $file) {
-            $content .= "({$file->mode}){$file->filepath}" . PHP_EOL;
+            $content .= "({$file->mode}){$file->filepath}".PHP_EOL;
         }
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -395,12 +395,12 @@ 
     private static function getCorruptedFiles(): string
     {
         $content = '──────────────────────────────────── Corrupted files ────────────────────────────────────';
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         $files   = Main::checkForCorruptedFiles();
         foreach ($files as $file) {
-            $content .= $file . PHP_EOL;
+            $content .= $file.PHP_EOL;
         }
-        $content .= PHP_EOL . PHP_EOL;
+        $content .= PHP_EOL.PHP_EOL;
         return $content;
     }
 
@@ -438,7 +438,7 @@ 
             $response        = json_decode($resultrequest, true);
             $res->data['ip'] = $response['ip'];
         } else {
-            $res->messages[] = 'Error format data ' . $resultrequest;
+            $res->messages[] = 'Error format data '.$resultrequest;
         }
 
         return $res;

src/PBXCoreREST/Controllers/Sysinfo/GetController.php

Spacing +2 added lines, -2 removed lines

@@ -53,10 +53,10 @@
         if ($response !== false) {
             $response = json_decode($response, true);
             $filename = $response['data']['filename'] ?? '';
-            if ( ! file_exists($filename)) {
+            if (!file_exists($filename)) {
                 $response['messages'][] = 'System information collected file not found';
             } else {
-                $response['data']['content']  = '' . file_get_contents($filename);
+                $response['data']['content'] = ''.file_get_contents($filename);
                 unlink($filename);
             }
             $this->response->setPayloadSuccess($response);

src/Common/Models/PbxSettings.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
     {
         return [
             'Name'                            => 'PBX system',
-            'VirtualHardwareType'             => 'REAL',//VMWARE,HYPERV,AWS,AZURE
+            'VirtualHardwareType'             => 'REAL', //VMWARE,HYPERV,AWS,AZURE
             'Description'                     => '',
             'RestartEveryNight'               => '0',
             'SIPPort'                         => '5060',
@@ -100,7 +100,7 @@ 
             'VoicemailNotificationsEmail'     => 'admin@mycompany.com',
             'VoicemailExten'                  => '*001',
             'PBXLanguage'                     => 'en-en',
-            'PBXInternalExtensionLength'      => '3',// Длина внутреннего номера
+            'PBXInternalExtensionLength'      => '3', // Длина внутреннего номера
             'PBXRecordCalls'                  => '1',
             'PBXSplitAudioThread'             => '0',
             'PBXCallParkingExt'               => '800',
@@ -138,7 +138,7 @@ 
         $result = parent::findFirstByKey($key);
         if ($result === null || $result->value === null) {
             $arrOfDefaultValues = self::getDefaultArrayValues();
-            if ( ! array_key_exists($key, $arrOfDefaultValues)) {
+            if (!array_key_exists($key, $arrOfDefaultValues)) {
                 return '';
             }
 

src/Core/Asterisk/Configs/IVRConf.php

Spacing +18 added lines, -18 removed lines

@@ -27,12 +27,12 @@ 
         /** @var Sip $sip_peer */
         foreach ($db_data as $sip_peer) {
             $len = strlen($sip_peer['extension']);
-            if(!in_array($len, $arr_lens)){
+            if (!in_array($len, $arr_lens)) {
                 $arr_lens[] = $len;
             }
         }
 
-        $db_data           = IvrMenu::find()->toArray();
+        $db_data = IvrMenu::find()->toArray();
         // Генерация внутреннего номерного плана.
         $conf = '';
         foreach ($db_data as $ivr) {
@@ -48,13 +48,13 @@ 
             }
             $try_count_ivr = $ivr['number_of_repeat'];
             $conf          .= "[ivr-{$ivr['extension']}] \n";
-            $conf          .= 'exten => s,1,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . "\n\t";
+            $conf          .= 'exten => s,1,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'."\n\t";
             $conf          .= "same => n,Set(APPEXTEN={$ivr['extension']})\n\t";
-            $conf          .= 'same => n,Gosub(dial_app,${EXTEN},1)' . "\n\t";
-            $conf          .= 'same => n,Answer()' . "\n\t";
-            $conf          .= 'same => n,Set(try_count=0); №6' . "\n\t";
-            $conf          .= 'same => n,Set(try_count=$[${try_count} + 1])' . "\n\t";
-            $conf          .= 'same => n,GotoIf($[${try_count} > ' . $try_count_ivr . ']?internal,' . $ivr['timeout_extension'] . ',1)' . "\n\t";
+            $conf          .= 'same => n,Gosub(dial_app,${EXTEN},1)'."\n\t";
+            $conf          .= 'same => n,Answer()'."\n\t";
+            $conf          .= 'same => n,Set(try_count=0); №6'."\n\t";
+            $conf          .= 'same => n,Set(try_count=$[${try_count} + 1])'."\n\t";
+            $conf          .= 'same => n,GotoIf($[${try_count} > '.$try_count_ivr.']?internal,'.$ivr['timeout_extension'].',1)'."\n\t";
             $conf          .= "same => n,Set(TIMEOUT(digit)=2) \n\t";
             $conf          .= "same => n,Background({$audio_message}) \n\t";
             if ($timeout_wait_exten > 0) {
@@ -71,11 +71,11 @@ 
             $conf .= "exten => t,1,Goto(s,6)\n";
 
             if ($ivr['allow_enter_any_internal_extension'] === '1') {
-                foreach ($arr_lens as $len){
+                foreach ($arr_lens as $len) {
                     $extension = Util::getExtensionX($len);
-                    $conf .= 'exten => _'.$extension.',1,ExecIf($["${DIALPLAN_EXISTS(internal,${EXTEN},1)}" == "0"]?Goto(i,1))' . "\n\t";
-                    $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(i,1))' . "\n\t";
-                    $conf .= 'same => n,Goto(internal,${EXTEN},1)' . "\n";
+                    $conf .= 'exten => _'.$extension.',1,ExecIf($["${DIALPLAN_EXISTS(internal,${EXTEN},1)}" == "0"]?Goto(i,1))'."\n\t";
+                    $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(i,1))'."\n\t";
+                    $conf .= 'same => n,Goto(internal,${EXTEN},1)'."\n";
                 }
             }
         }
@@ -91,7 +91,7 @@ 
     public function extensionGenHints(): string
     {
         $conf = '';
-        $db_data           = IvrMenu::find()->toArray();
+        $db_data = IvrMenu::find()->toArray();
         foreach ($db_data as $ivr) {
             $conf .= "exten => {$ivr['extension']},hint,Custom:{$ivr['extension']} \n";
         }
@@ -117,7 +117,7 @@ 
             $time_str = implode($out);
             preg_match_all('/^\d{2}:\d{2}:\d{2}.?\d{0,2}$/', $time_str, $matches, PREG_SET_ORDER, 0);
             if (count($matches) > 0) {
-                $data   = date_parse($time_str);
+                $data = date_parse($time_str);
                 $result += $data['minute'] * 60 + $data['second'];
             }
         }
@@ -135,7 +135,7 @@ 
         $ivr_ext_conf = '';
         $db_data           = IvrMenu::find()->toArray();
         foreach ($db_data as $ivr) {
-            $ivr_ext_conf .= "exten => {$ivr['extension']},1,Goto(ivr-{$ivr['extension']},s,1)" . "\n";
+            $ivr_ext_conf .= "exten => {$ivr['extension']},1,Goto(ivr-{$ivr['extension']},s,1)"."\n";
         }
         $ivr_ext_conf .= "\n";
 
@@ -148,10 +148,10 @@ 
     public function extensionGenInternalTransfer(): string
     {
         $conf = '';
-        $db_data           = IvrMenu::find()->toArray();
+        $db_data = IvrMenu::find()->toArray();
         foreach ($db_data as $ivr) {
-            $conf .= 'exten => _' . $ivr['extension'] . ',1,Set(__ISTRANSFER=transfer_)' . " \n\t";
-            $conf .= 'same => n,Goto(internal,${EXTEN},1)' . " \n";
+            $conf .= 'exten => _'.$ivr['extension'].',1,Set(__ISTRANSFER=transfer_)'." \n\t";
+            $conf .= 'same => n,Goto(internal,${EXTEN},1)'." \n";
         }
 
         return $conf;

src/Core/System/SystemLoader.php

Spacing +3 added lines, -3 removed lines

@@ -27,7 +27,7 @@ 
     public function startSystem(): bool
     {
         $this->di->getShared('registry')->booting = true;
-        $storage                          = new Storage();
+        $storage = new Storage();
         Util::echoWithSyslog(' - Mount storage disk... ');
         $storage->saveFstab();
         $storage->configure();
@@ -122,12 +122,12 @@ 
         Util::echoGreenDone();
 
         Util::echoWithSyslog(' - Configuring Asterisk...'.PHP_EOL);
-        $pbx                              = new PBX();
+        $pbx = new PBX();
         $pbx->configure();
 
         Util::echoWithSyslog(' - Start Asterisk... ');
         $pbx->start();
-        $system                           = new System();
+        $system = new System();
         $system->onAfterPbxStarted();
         Util::echoGreenDone();
 

src/Common/Models/Codecs.php

Spacing +3 added lines, -3 removed lines

@@ -33,17 +33,17 @@
      * Audio or Video codec
      * @Column(type="string", nullable=true)
      */
-    public ?string $type='audio';
+    public ?string $type = 'audio';
 
     /**
      * @Column(type="integer", nullable=true, default="1")
      */
-    public ?string $priority='1';
+    public ?string $priority = '1';
 
     /**
      * @Column(type="string", length=1, nullable=true)
      */
-    public ?string $disabled='0';
+    public ?string $disabled = '0';
 
     /**
      * @Column(type="string", nullable=true)

sites/pbxcore/index.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 $di = new FactoryDefault();
 
 // Auto-loader configuration
-require_once __DIR__ . '/../../src/Common/Config/ClassLoader.php';
+require_once __DIR__.'/../../src/Common/Config/ClassLoader.php';
 
 // Attach Sentry error logger
 $errorLogger = new SentryErrorLogger('pbx-core-rest');
@@ -34,7 +34,7 @@ 
 } catch (Error $e) {
     $errorLogger->captureException($e);
     echo $e->getMessage();
-    Util::sysLogMsg('pbx_core_api', $e->getMessage() );
+    Util::sysLogMsg('pbx_core_api', $e->getMessage());
 }