mikopbx / Core

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/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/Modules/Models/ModulesModelsBase.php

Spacing +5 added lines, -5 removed lines

@@ -33,7 +33,7 @@ 
             $this->setConnectionService("{$this->moduleUniqueId}_module_db");
         }
         parent::initialize();
-        $this->initialized=true;
+        $this->initialized = true;
     }
 
     /**
@@ -45,7 +45,7 @@ 
      */
     public function getRepresent($needLink = false): string
     {
-        if (!$this->initialized){
+        if (!$this->initialized) {
             $this->initialize();
         }
 
@@ -55,7 +55,7 @@ 
 
         if (isset($this->moduleUniqueId)) {
             $name = '<i class="puzzle piece icon"></i> '
-                . $this->t('mo_' . $this->moduleUniqueId);
+                . $this->t('mo_'.$this->moduleUniqueId);
         } else {
             $name = 'Unknown';
         }
@@ -67,7 +67,7 @@ 
             $link = $this->getWebInterfaceLink();
 
             $result = $this->t(
-                'rep' . $this->moduleUniqueId,
+                'rep'.$this->moduleUniqueId,
                 [
                     'represent' => "<a href='{$link}'>{$name}</a>",
                 ]
@@ -86,7 +86,7 @@ 
      */
     public function getWebInterfaceLink(): string
     {
-        if (!$this->initialized){
+        if (!$this->initialized) {
             $this->initialize();
         }
         if (isset($this->moduleUniqueId)) {

src/Common/Messages/en.php

Indentation +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
 return [
     /**
- * Copyright © MIKO LLC - All Rights Reserved
- * Unauthorized copying of this file, via any medium is strictly prohibited
- * Proprietary and confidential
- * Written by Alexey Portnov, 8 2020
- */
+     * Copyright © MIKO LLC - All Rights Reserved
+     * Unauthorized copying of this file, via any medium is strictly prohibited
+     * Proprietary and confidential
+     * Written by Alexey Portnov, 8 2020
+     */
     'January' => 'January',
     'February' => 'February',
     'March' => 'March',

src/Core/Asterisk/Configs/IAXConf.php

Spacing +8 added lines, -8 removed lines

@@ -30,8 +30,8 @@ 
         $conf .= $this->generateGeneral();
         $conf .= $this->generateProviders();
 
-        Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/iax.conf', $conf);
-        file_put_contents($this->config->path('asterisk.astetcdir') . '/iaxprov.conf', "[default]\ncodec=alaw\n");
+        Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/iax.conf', $conf);
+        file_put_contents($this->config->path('asterisk.astetcdir').'/iaxprov.conf', "[default]\ncodec=alaw\n");
     }
 
 
@@ -40,9 +40,9 @@ 
      */
     private function getProviders(): array
     {
-        $data_providers =[];
+        $data_providers = [];
         // Получим настройки всех аккаунтов.
-        $arrIaxProviders              = Iax::find("disabled IS NULL OR disabled = '0'");
+        $arrIaxProviders = Iax::find("disabled IS NULL OR disabled = '0'");
         foreach ($arrIaxProviders as $peer) {
             /** @var \MikoPBX\Common\Models\Iax $peer */
             $arr_data = $peer->toArray();
@@ -56,7 +56,7 @@ 
                 'conditions'=>'disabled="0"',
                 'order' => 'type, priority',
             ];
-            $codecs             = Codecs::find($filter);
+            $codecs = Codecs::find($filter);
             foreach ($codecs as $ob_codec) {
                 $arr_data['codecs'][] = $ob_codec->name;
             }
@@ -92,7 +92,7 @@ 
     private function generateGeneral(): string
     {
         $iax_port = (trim($this->generalSettings['IAXPort']) !== '') ? $this->generalSettings['IAXPort'] : '4569';
-        $conf     = '[general]' . "\n";
+        $conf     = '[general]'."\n";
         // $conf .= "context=public-direct-dial \n";
         $conf .= "bindport={$iax_port}\n";
         $conf .= "bindaddr=0.0.0.0\n";
@@ -152,12 +152,12 @@ 
                 $secret = (trim($provider['secret']) == '') ? '' : ":{$provider['secret']}";
                 $host   = $provider['host'];
                 // $port	   = (trim($provider['port']) =='')?'':":{$provider['port']}";
-                $port        = '';
+                $port = '';
                 $reg_strings .= "register => {$user}{$secret}@{$host}{$port} \n";
             }
         }
 
-        return $reg_strings . "\n" . $prov_config;
+        return $reg_strings."\n".$prov_config;
     }
 
 }