mikopbx / Core

src/PBXCoreREST/Lib/SIPStackProcessor.php

Spacing +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
                 continue;
             }
             foreach ($peers as &$peer) {
-                if(!empty($peer['id'])){
+                if (!empty($peer['id'])) {
                     continue;
                 }
                 if ($peer['host'] !== $provider->host || $peer['username'] !== $provider->username) {

src/Modules/PbxExtensionBase.php

Spacing +6 added lines, -6 removed lines

@@ -54,20 +54,20 @@
         $this->config  = $this->di->getShared('config');
         $modulesDir    = $this->config->path('core.modulesDir');
 
-        if (empty($this->moduleUniqueId)){
+        if (empty($this->moduleUniqueId)) {
             // Get child class parameters and define module Dir and UniqueID
             $reflector = new ReflectionClassAlias(static::class);
             $partsOfNameSpace = explode('\\', $reflector->getNamespaceName());
-            if (count($partsOfNameSpace)===3 && $partsOfNameSpace[0]==='Modules'){
+            if (count($partsOfNameSpace) === 3 && $partsOfNameSpace[0] === 'Modules') {
                 $this->moduleUniqueId = $partsOfNameSpace[1];
-                $this->moduleDir =  $modulesDir.'/'.$this->moduleUniqueId;
+                $this->moduleDir = $modulesDir.'/'.$this->moduleUniqueId;
             }
         } else {
-            $this->moduleDir  = "{$modulesDir}{$this->moduleUniqueId}";
+            $this->moduleDir = "{$modulesDir}{$this->moduleUniqueId}";
         }
 
-        $className        = basename(str_replace('\\', '/', static::class));
-        $this->logger =  new Logger($className, $this->moduleUniqueId);
+        $className = basename(str_replace('\\', '/', static::class));
+        $this->logger = new Logger($className, $this->moduleUniqueId);
 
     }
 }
\ No newline at end of file

src/PBXCoreREST/Lib/PBXApiResult.php

Spacing +3 added lines, -3 removed lines

@@ -19,7 +19,7 @@ 
      * Request result
      * @var bool
      */
-    public bool $success=false;
+    public bool $success = false;
 
     /**
      * Array of result fields
@@ -48,10 +48,10 @@ 
 
     public function __construct()
     {
-        $this->success= false;
+        $this->success = false;
         $this->data = [];
         $this->messages = [];
-        $this->function ='';
+        $this->function = '';
         $this->processor = '';
     }
 

src/Modules/Setup/PbxExtensionSetupInterface.php

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
      *
      * @return bool результат удаления
      */
-    public function unInstallFiles(bool $keepSettings = false);//: bool Пока мешает удалять и обновлять старые модули, раскоменитровать после релиза 2020.5;
+    public function unInstallFiles(bool $keepSettings = false); //: bool Пока мешает удалять и обновлять старые модули, раскоменитровать после релиза 2020.5;
 
     /**
      * Returns error messages

src/Core/System/Configs/SSHConf.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
     public function configure()
     {
         $lofFile = '/var/log/lastlog';
-        if(!file_exists($lofFile)){
+        if (!file_exists($lofFile)) {
             file_put_contents($lofFile, '');
         }
         $dropbear_dir = '/etc/dropbear';
@@ -46,7 +46,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) {
@@ -54,7 +54,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
                 Util::mwExec("{$dropbearkeyPath} -t $keytype -f $res_keyfilepath");
                 // Storing

src/Core/Asterisk/Configs/ResParkingConf.php

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
      * ResParkingConf constructor.
      *
      */
-    public function __construct(){
+    public function __construct()
+    {
         parent::__construct();
         // Вызов "getSettings" приемлем, так как идет работа с инициализированной переменной generalSettings.
         $this->getSettings();

Spacing +23 added lines, -23 removed lines

@@ -24,7 +24,7 @@ 
      * ResParkingConf constructor.
      *
      */
-    public function __construct(){
+    public function __construct() {
         parent::__construct();
         // Вызов "getSettings" приемлем, так как идет работа с инициализированной переменной generalSettings.
         $this->getSettings();
@@ -33,18 +33,18 @@ 
     protected function generateConfigProtected(): void
     {
         // Генерация конфигурационных файлов.
-        $conf   = "[general] \n" .
-            "parkeddynamic = yes \n\n" .
-            "[default] \n" .
-            "context => parked-calls \n" .
-            "parkedcallreparking = caller\n" .
-            "parkedcalltransfers = caller\n" .
-            "parkext => {$this->ParkingExt} \n" .
-            "findslot => next\n" .
-            "comebacktoorigin=no\n" .
-            "comebackcontext = parked-calls-timeout\n" .
+        $conf = "[general] \n".
+            "parkeddynamic = yes \n\n".
+            "[default] \n".
+            "context => parked-calls \n".
+            "parkedcallreparking = caller\n".
+            "parkedcalltransfers = caller\n".
+            "parkext => {$this->ParkingExt} \n".
+            "findslot => next\n".
+            "comebacktoorigin=no\n".
+            "comebackcontext = parked-calls-timeout\n".
             "parkpos => {$this->ParkingStartSlot}-{$this->ParkingEndSlot} \n\n";
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/res_parking.conf', $conf);
+        file_put_contents($this->config->path('asterisk.astetcdir').'/res_parking.conf', $conf);
     }
 
 
@@ -82,8 +82,8 @@ 
     public function getSettings(): void
     {
         $this->ParkingExt       = $this->generalSettings['PBXCallParkingExt'];
-        $this->ParkingStartSlot = (int)$this->generalSettings['PBXCallParkingStartSlot'];
-        $this->ParkingEndSlot   = (int)$this->generalSettings['PBXCallParkingEndSlot'];
+        $this->ParkingStartSlot = (int) $this->generalSettings['PBXCallParkingStartSlot'];
+        $this->ParkingEndSlot   = (int) $this->generalSettings['PBXCallParkingEndSlot'];
     }
 
     /**
@@ -104,7 +104,7 @@ 
     public function getIncludeInternalTransfer(): string
     {
         // Генерация внутреннего номерного плана.
-        return 'exten => ' . $this->ParkingExt . ',1,Goto(parked-calls,${EXTEN},1)' . "\n";
+        return 'exten => '.$this->ParkingExt.',1,Goto(parked-calls,${EXTEN},1)'."\n";
     }
 
     /**
@@ -118,16 +118,16 @@ 
         $conf = '';
         $conf .= "[parked-calls]\n";
         $conf .= "exten => _X!,1,AGI(cdr_connector.php,unpark_call)\n\t";
-        $conf .= 'same => n,ExecIf($["${pt1c_PARK_CHAN}x" == "x"]?Hangup())' . "\n\t";
-        $conf .= 'same => n,Bridge(${pt1c_PARK_CHAN},kKTt)' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n\n";
+        $conf .= 'same => n,ExecIf($["${pt1c_PARK_CHAN}x" == "x"]?Hangup())'."\n\t";
+        $conf .= 'same => n,Bridge(${pt1c_PARK_CHAN},kKTt)'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n\n";
 
         $conf .= "[parked-calls-timeout]\n";
         $conf .= "exten => s,1,NoOp(This is all that happens to parked calls if they time out.)\n\t";
-        $conf .= 'same => n,Set(FROM_PEER=${EMPTYVAR})' . "\n\t";
-        $conf .= 'same => n,AGI(cdr_connector.php,unpark_call_timeout)' . "\n\t";
-        $conf .= 'same => n,Goto(internal,${CUT(PARKER,/,2)},1)' . "\n\t";
-        $conf .= 'same => n,Hangup()' . "\n\n";
+        $conf .= 'same => n,Set(FROM_PEER=${EMPTYVAR})'."\n\t";
+        $conf .= 'same => n,AGI(cdr_connector.php,unpark_call_timeout)'."\n\t";
+        $conf .= 'same => n,Goto(internal,${CUT(PARKER,/,2)},1)'."\n\t";
+        $conf .= 'same => n,Hangup()'."\n\n";
 
         return $conf;
     }
@@ -141,7 +141,7 @@ 
     {
         $conf = '';
         for ($ext = $this->ParkingStartSlot; $ext <= $this->ParkingEndSlot; $ext++) {
-            $conf .= 'exten => ' . $ext . ',1,Goto(parked-calls,${EXTEN},1)' . "\n";
+            $conf .= 'exten => '.$ext.',1,Goto(parked-calls,${EXTEN},1)'."\n";
         }
         $conf .= "\n";
 

src/Core/Asterisk/Configs/LoggerConf.php

Spacing +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 
     protected function generateConfigProtected(): void
     {
-        $logDir = System::getLogDir() . '/asterisk/';
+        $logDir = System::getLogDir().'/asterisk/';
         Util::mwMkdir($logDir);
         $conf = "[general]\n";
         $conf .= "queue_log = no\n";
@@ -33,6 +33,6 @@ 
         $conf .= "{$logDir}verbose => verbose(3),dtmf,fax\n";
         $conf .= "\n";
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/logger.conf', $conf);
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/logger.conf', $conf);
     }
 }
\ No newline at end of file

src/Core/Workers/WorkerRemoveOldRecords.php

Spacing +3 added lines, -3 removed lines

@@ -14,12 +14,12 @@ 
 
 class WorkerRemoveOldRecords extends WorkerBase
 {
-    protected int $maxProc=1;
+    protected int $maxProc = 1;
 
     public function start($argv): void
     {
         $varEtcDir = $this->di->getShared('config')->path('core.varEtcDir');
-        $filename   = "{$varEtcDir}/storage_device";
+        $filename = "{$varEtcDir}/storage_device";
         if (file_exists($filename)) {
             $mount_point = file_get_contents($filename);
         } else {
@@ -54,7 +54,7 @@ 
             $out
         );
         foreach ($out as $dir_info) {
-            if ( ! is_dir($dir_info)) {
+            if (!is_dir($dir_info)) {
                 echo 'error';
                 continue;
             }

src/Core/System/PBX.php

Spacing +12 added lines, -12 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;
 
@@ -202,7 +202,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();
@@ -218,7 +218,7 @@ 
      */
     public static function sipReload():void
     {
-        $di     = Di::getDefault();
+        $di = Di::getDefault();
         if ($di === null) {
             return;
         }
@@ -239,12 +239,12 @@ 
                 $exthostname = trim($if_data['exthostname']);
             }
         }
-        $old_hash   = '';
+        $old_hash = '';
         $varEtcDir = $di->getShared('config')->path('core.varEtcDir');
-        if (file_exists($varEtcDir . '/topology_hash')) {
-            $old_hash = file_get_contents($varEtcDir . '/topology_hash');
+        if (file_exists($varEtcDir.'/topology_hash')) {
+            $old_hash = file_get_contents($varEtcDir.'/topology_hash');
         }
-        $now_hadh = md5($topology . $exthostname . $extipaddr);
+        $now_hadh = md5($topology.$exthostname.$extipaddr);
 
         $sip = new SIPConf();
         $sip->generateConfig();
@@ -271,7 +271,7 @@ 
      */
     public static function iaxReload(): void
     {
-        $iax    = new IAXConf();
+        $iax = new IAXConf();
         $iax->generateConfig();
         $asteriskPath = Util::which('asterisk');
         Util::mwExec("{$asteriskPath} -rx 'iax2 reload'");
@@ -322,7 +322,7 @@ 
             'result' => 'ERROR',
         ];
 
-        if ( ! $this->di->getShared('registry')->booting) {
+        if (!$this->di->getShared('registry')->booting) {
             $this->stop();
         }
         /**
@@ -338,7 +338,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();