mikopbx / Core

src/Modules/PbxExtensionBase.php

Spacing +6 added lines, -6 removed lines

@@ -52,20 +52,20 @@
         $this->config  = $this->getDI()->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/CdrDBProcessor.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
         $res = new PBXApiResult();
         $res->processor = __METHOD__;
         $res->success = true;
-        $filter  = [
+        $filter = [
             'order'       => 'id',
             'columns'     => 'start,answer,endtime,src_num,dst_num,did,linkedid',
             'miko_tmp_db' => true,
@@ -66,7 +66,7 @@ 
         $message = $client->request(json_encode($filter), 2);
         if ($message === false) {
             $res->data = [];
-        }else{
+        } else {
                 $res->data[] = $message;
         }
         return $res;
@@ -83,7 +83,7 @@ 
         $res->processor = __METHOD__;
         $res->success = true;
 
-        $filter  = [
+        $filter = [
             'endtime IS NULL',
             'order'               => 'id',
             'columns'             => 'start,answer,src_chan,dst_chan,src_num,dst_num,did,linkedid',
@@ -104,7 +104,7 @@ 
                 $data = json_decode(file_get_contents($result), true);
                 unlink($result);
                 foreach ($data as $row) {
-                    if ( ! isset($active_chans[$row['linkedid']])) {
+                    if (!isset($active_chans[$row['linkedid']])) {
                         // Вызов уже не существует.
                         continue;
                     }

Braces +1 added lines, -1 removed lines

@@ -66,7 +66,7 @@
         $message = $client->request(json_encode($filter), 2);
         if ($message === false) {
             $res->data = [];
-        }else{
+        } else{
                 $res->data[] = $message;
         }
         return $res;

src/Core/System/Notifications.php

Spacing +7 added lines, -7 removed lines

@@ -78,7 +78,7 @@ 
                 $from_name = $settings['MailSMTPFromUsername'];
             }
 
-            $mail->Port    = (integer)$settings['MailSMTPPort'];
+            $mail->Port    = (integer) $settings['MailSMTPPort'];
             $mail->CharSet = 'UTF-8';
 
             $mail->setFrom($from_address, $from_name);
@@ -90,14 +90,14 @@ 
             $mail->Subject = $subject;
             $mail->Body    = $message;
 
-            if ( ! $mail->send()) {
+            if (!$mail->send()) {
                 $messages[] = $mail->ErrorInfo;
             }
         } catch (Throwable $e) {
             $messages[] = $e->getMessage();
         }
 
-        if (count($messages)>0) {
+        if (count($messages) > 0) {
             Util::sysLogMsg('PHPMailer', implode(' ', $messages), LOG_ERR);
             return false;
         }
@@ -109,7 +109,7 @@ 
         $settings             = $mikoPBXConfig->getGeneralSettings();
         $systemNotificationsEmail = $settings['SystemNotificationsEmail'];
         $result = self::sendMail($systemNotificationsEmail, 'Test mail from MIKO PBX', '<b>Test message</b><hr>');
-        return ($result===true);
+        return ($result === true);
     }
 
     /**
@@ -122,10 +122,10 @@ 
         $mikoPBXConfig = new MikoPBXConfig();
         $settings      = $mikoPBXConfig->getGeneralSettings();
 
-        $conf = "defaults\n" .
-            "auth       on\n" .
+        $conf = "defaults\n".
+            "auth       on\n".
             // "logfile    /var/log/msmtp.log\n".
-            "timeout    10\n" .
+            "timeout    10\n".
             "syslog     LOG_LOCAL0\n\n";
 
         if (isset($settings["MailSMTPUseTLS"]) && $settings["MailSMTPUseTLS"] == "1") {

src/Core/System/Upgrade/Releases/UpdateConfigsUpToVer20202754.php

Spacing +18 added lines, -18 removed lines

@@ -83,7 +83,7 @@ 
             'slin'  => 'Signed Linear PCM',
             'opus'  => 'Opus',
         ];
-        $codecs      = Codecs::find();
+        $codecs = Codecs::find();
         // Удалим лишние кодеки
         /** @var Codecs $codec */
         foreach ($codecs as $codec) {
@@ -91,10 +91,10 @@ 
                 $this->checkDisabledCodec($codec);
                 continue;
             }
-            if ( ! $codec->delete()) {
+            if (!$codec->delete()) {
                 Util::sysLogMsg(
                     __CLASS__,
-                    'Can not delete codec ' . $codec->name . ' from MikoPBX\Common\Models\Codecs'
+                    'Can not delete codec '.$codec->name.' from MikoPBX\Common\Models\Codecs'
                 );
             }
         }
@@ -109,7 +109,7 @@ 
      */
     private function checkDisabledCodec(Codecs $codec): void
     {
-        if ( ! in_array($codec->disabled, ['0', '1'], true)) {
+        if (!in_array($codec->disabled, ['0', '1'], true)) {
             $codec->disabled = '0';
             $codec->save();
         }
@@ -123,7 +123,7 @@ 
     private function addNewCodecs(array $availCodecs): void
     {
         foreach ($availCodecs as $availCodec => $desc) {
-            $codecData = Codecs::findFirst('name="' . $availCodec . '"');
+            $codecData = Codecs::findFirst('name="'.$availCodec.'"');
             if ($codecData === null) {
                 $codecData = new Codecs();
             } elseif ($codecData->description === $desc) {
@@ -138,10 +138,10 @@ 
             }
             $codecData->type        = $type;
             $codecData->description = $desc;
-            if ( ! $codecData->save()) {
+            if (!$codecData->save()) {
                 Util::sysLogMsg(
                     __CLASS__,
-                    'Can not update codec info ' . $codecData->name . ' from \MikoPBX\Common\Models\Codecs'
+                    'Can not update codec info '.$codecData->name.' from \MikoPBX\Common\Models\Codecs'
                 );
             }
         }
@@ -193,12 +193,12 @@ 
         $astDbPath = $this->config->path('astDatabase.dbfile');
         if (file_exists($astDbPath)) {
             $table = 'astdb';
-            $sql   = 'DELETE FROM ' . $table . ' WHERE key LIKE "/DND/SIP%" OR key LIKE "/CF/SIP%" OR key LIKE "/UserBuddyStatus/SIP%"';
+            $sql   = 'DELETE FROM '.$table.' WHERE key LIKE "/DND/SIP%" OR key LIKE "/CF/SIP%" OR key LIKE "/UserBuddyStatus/SIP%"';
             $db    = new SQLite3($astDbPath);
             try {
                 $db->exec($sql);
             } catch (Throwable $e) {
-                Util::sysLogMsg(__CLASS__, 'Can clean astdb from UserBuddyStatus...' . $e->getMessage());
+                Util::sysLogMsg(__CLASS__, 'Can clean astdb from UserBuddyStatus...'.$e->getMessage());
                 sleep(2);
             }
             $db->close();
@@ -211,12 +211,12 @@ 
      */
     private function copyMohFilesToStorage(): void
     {
-        $oldMohDir = $this->config->path('asterisk.astvarlibdir') . '/sounds/moh';
-        if ( ! file_exists($oldMohDir)) {
+        $oldMohDir = $this->config->path('asterisk.astvarlibdir').'/sounds/moh';
+        if (!file_exists($oldMohDir)) {
             return;
         }
         $currentMohDir = $this->config->path('asterisk.mohdir');
-        if ( ! Util::mwMkdir($currentMohDir)) {
+        if (!Util::mwMkdir($currentMohDir)) {
             return;
         }
 
@@ -225,9 +225,9 @@ 
             if (in_array($file, ['.', '..'])) {
                 continue;
             }
-            if (copy($oldMohDir . '/' . $file, $currentMohDir . '/' . $file)) {
+            if (copy($oldMohDir.'/'.$file, $currentMohDir.'/'.$file)) {
                 $sound_file           = new SoundFiles();
-                $sound_file->path     = $currentMohDir . '/' . $file;
+                $sound_file->path     = $currentMohDir.'/'.$file;
                 $sound_file->category = SoundFiles::CATEGORY_MOH;
                 $sound_file->name     = $file;
                 $sound_file->save();
@@ -291,7 +291,7 @@ 
             Extensions::TYPE_CONFERENCE,
 
         ];
-        $extensions           = Extensions::find();
+        $extensions = Extensions::find();
         foreach ($extensions as $extension) {
             if (in_array($extension->type, $showInPhonebookTypes)) {
                 $extension->show_in_phonebook = '1';
@@ -306,14 +306,14 @@ 
      */
     private function moveReadOnlySoundsToStorage(): void
     {
-        $currentMediaDir = $this->config->path('asterisk.customSoundDir') . '/';
-        if ( ! is_dir($currentMediaDir)) {
+        $currentMediaDir = $this->config->path('asterisk.customSoundDir').'/';
+        if (!is_dir($currentMediaDir)) {
             Util::mwMkdir($currentMediaDir);
         }
         $soundFiles = SoundFiles::find();
         foreach ($soundFiles as $soundFile) {
             if (stripos($soundFile->path, '/offload/asterisk/sounds/other/') === 0) {
-                $newPath = $currentMediaDir . pathinfo($soundFile->path)['basename'];
+                $newPath = $currentMediaDir.pathinfo($soundFile->path)['basename'];
                 if (copy($soundFile->path, $newPath)) {
                     $soundFile->path = $newPath;
                     $soundFile->update();

src/Core/System/Upgrade/UpdateDatabase.php

Spacing +9 added lines, -9 removed lines

@@ -59,7 +59,7 @@ 
             $moduleModelClass = "MikoPBX\\Common\\Models\\{$className}";
             try {
                 $this->createUpdateDbTableByAnnotations($moduleModelClass);
-            } catch (Throwable $exception){
+            } catch (Throwable $exception) {
                 Util::echoWithSyslog('Errors within update table '.$className.' '.$exception->getMessage());
             }
         }
@@ -78,7 +78,7 @@ 
     {
         $result = true;
         if (
-            ! class_exists($modelClassName)
+            !class_exists($modelClassName)
             || count(get_class_vars($modelClassName)) === 0) {
             return true;
         }
@@ -118,7 +118,7 @@ 
                 'isNumeric' => false,
                 'primary'   => false,
             ];
-            $previousAttribute           = $attribute;
+            $previousAttribute = $attribute;
         }
 
         // Set data types
@@ -226,8 +226,8 @@ 
 
         $connectionService->begin();
 
-        if ( ! $connectionService->tableExists($tableName)) {
-            Util::echoWithSyslog(' - UpdateDatabase: Create new table: ' . $tableName . ' ');
+        if (!$connectionService->tableExists($tableName)) {
+            Util::echoWithSyslog(' - UpdateDatabase: Create new table: '.$tableName.' ');
             $result = $connectionService->createTable($tableName, '', $columnsNew);
             Util::echoGreenDone();
         } else {
@@ -235,7 +235,7 @@ 
             $currentColumnsArr = $connectionService->describeColumns($tableName, '');
 
             if ($this->isTableStructureNotEqual($currentColumnsArr, $columns)) {
-                Util::echoWithSyslog(' - UpdateDatabase: Upgrade table: ' . $tableName . ' ');
+                Util::echoWithSyslog(' - UpdateDatabase: Upgrade table: '.$tableName.' ');
                 // Create new table and copy all data
                 $currentStateColumnList = [];
                 $oldColNames            = []; // Старые названия колонок
@@ -325,13 +325,13 @@ 
                 if ($oldField->$compared_setting() !== $newField->$compared_setting()) {
                     // Sqlite transform "1" to ""1"" in default settings, but it is normal
                     if ($compared_setting === 'getDefault'
-                        && $oldField->$compared_setting() === '"' . $newField->$compared_setting() . '"') {
+                        && $oldField->$compared_setting() === '"'.$newField->$compared_setting().'"') {
                         continue;
                     }
 
                     // Description for "length" is integer, but table structure store it as string
                     if ($compared_setting === 'getSize'
-                        && (string)$oldField->$compared_setting() === (string)$newField->$compared_setting()) {
+                        && (string) $oldField->$compared_setting() === (string) $newField->$compared_setting()) {
                         continue;
                     }
 
@@ -359,7 +359,7 @@ 
         // Drop not exist indexes
         foreach ($currentIndexes as $indexName => $currentIndex) {
             if (stripos($indexName, 'sqlite_autoindex') === false
-                && ! array_key_exists($indexName, $indexes)
+                && !array_key_exists($indexName, $indexes)
             ) {
                 Util::echoWithSyslog(" - UpdateDatabase: Delete index: {$indexName} ");
                 $result = $result + $connectionService->dropIndex($tableName, '', $indexName);

src/Core/System/System.php

Spacing +3 added lines, -3 removed lines

@@ -175,7 +175,7 @@ 
         if (file_exists('/etc/TZ')) {
             $origin_tz = file_get_contents("/etc/TZ");
         }
-        if ($origin_tz !== $db_tz){
+        if ($origin_tz !== $db_tz) {
             self::timezoneConfigure();
         }
         $origin_tz = $db_tz;
@@ -245,7 +245,7 @@ 
         }
         if ($timezone) {
             $zone_file = "/usr/share/zoneinfo/{$timezone}";
-            if ( ! file_exists($zone_file)) {
+            if (!file_exists($zone_file)) {
                 return;
             }
             $cpPath = Util::which('cp');
@@ -283,7 +283,7 @@ 
             try {
                 /** @var \MikoPBX\Modules\Config\ConfigClass $appClass */
                 $appClass->onAfterPbxStarted();
-            }catch (Throwable $e){
+            } catch (Throwable $e) {
                 Util::sysLogMsg('onAfterPbxStarted', $e->getMessage());
             }
         }

Braces +1 added lines, -1 removed lines

@@ -283,7 +283,7 @@
             try {
                 /** @var \MikoPBX\Modules\Config\ConfigClass $appClass */
                 $appClass->onAfterPbxStarted();
-            }catch (Throwable $e){
+            } catch (Throwable $e){
                 Util::sysLogMsg('onAfterPbxStarted', $e->getMessage());
             }
         }

src/Common/Models/Extensions.php

Spacing +5 added lines, -5 removed lines

@@ -112,7 +112,7 @@ 
         $freeExtension = '2200100';
         for ($i = 100; ; $i++) {
             $freeExtension = "2200{$i}";
-            if ( ! in_array(['number' => $freeExtension], $result, false)) {
+            if (!in_array(['number' => $freeExtension], $result, false)) {
                 break;
             }
         }
@@ -421,8 +421,8 @@ 
                 $relatedModel     = $relation->getReferencedModel();
                 $referencedFields = is_array($referencedFields) ? $referencedFields : [$referencedFields];
                 foreach ($referencedFields as $referencedField) {
-                    $parameters     = [
-                        'conditions' => $referencedField . '= :oldNumber:',
+                    $parameters = [
+                        'conditions' => $referencedField.'= :oldNumber:',
                         'bind'       => ['oldNumber' => $snapShotData['number']],
                     ];
                     $relatedRecords = call_user_func([$relatedModel, 'find'], $parameters);
@@ -476,8 +476,8 @@ 
                 $relatedModel     = $relation->getReferencedModel();
                 $referencedFields = is_array($referencedFields) ? $referencedFields : [$referencedFields];
                 foreach ($referencedFields as $referencedField) {
-                    $parameters     = [
-                        'conditions' => $referencedField . '= :Number:',
+                    $parameters = [
+                        'conditions' => $referencedField.'= :Number:',
                         'bind'       => ['Number' => $this->number],
                     ];
                     $relatedRecords = call_user_func([$relatedModel, 'find'], $parameters);

src/Common/Providers/LicenseProvider.php

Spacing +2 added lines, -2 removed lines

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

Braces +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
     {
         $di->setShared(
             self::SERVICE_NAME,
-            function () {
+            function ()
+            {
                 try {
                     return new License('http://127.0.0.1:8223');
                 } catch (Throwable $exception){

src/AdminCabinet/Controllers/TopMenuSearchController.php

Spacing +15 added lines, -15 removed lines

@@ -46,7 +46,7 @@ 
             // IncomingRoutingTable',
             // OutgoingRoutingTable',
         ];
-        $results    = [[]];
+        $results = [[]];
         foreach ($arrClasses as $itemClass) {
             $records = call_user_func([$itemClass, 'find']);
             $categoryItems = [];
@@ -90,7 +90,7 @@ 
             'typeLocalized' => $this->translation->_("ex_dropdownCategory_{$type}"),
             'sorter'        => $clearedRepresent,
         ];
-        $items[]          = $result;
+        $items[] = $result;
     }
 
     /**
@@ -103,7 +103,7 @@ 
         $elements = $this->elements;
 
         $items[] = [
-            'name'          => $elements->getIconByController('incoming-routes') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('incoming-routes').' '.$this->translation->_(
                     'mm_IncomingRoutes'
                 ),
             'value'         => $this->url->get('incoming-routes'),
@@ -112,7 +112,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_IncomingRoutes')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('outbound-routes') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('outbound-routes').' '.$this->translation->_(
                     'mm_OutboundRoutes'
                 ),
             'value'         => $this->url->get('outbound-routes'),
@@ -121,7 +121,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_OutboundRoutes')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('general-settings') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('general-settings').' '.$this->translation->_(
                     'mm_GeneralSettings'
                 ),
             'value'         => $this->url->get('general-settings/modify'),
@@ -130,7 +130,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_GeneralSettings')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('time-settings') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('time-settings').' '.$this->translation->_(
                     'mm_SystemClock'
                 ),
             'value'         => $this->url->get('time-settings/modify'),
@@ -139,14 +139,14 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_SystemClock')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('network') . ' ' . $this->translation->_('mm_Network'),
+            'name'          => $elements->getIconByController('network').' '.$this->translation->_('mm_Network'),
             'value'         => $this->url->get('network/modify/'),
             'type'          => 'MENUITEMS',
             'typeLocalized' => $this->translation->_('ex_dropdownCategory_MENUITEMS'),
             'sorter'        => strip_tags($this->translation->_('mm_Network')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('mail-settings') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('mail-settings').' '.$this->translation->_(
                     'mm_MailSettings'
                 ),
             'value'         => $this->url->get('mail-settings/modify'),
@@ -155,7 +155,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_MailSettings')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('call-detail-records') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('call-detail-records').' '.$this->translation->_(
                     'mm_CallDetailRecords'
                 ),
             'value'         => $this->url->get('call-detail-records'),
@@ -164,7 +164,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_CallDetailRecords')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('sound-files') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('sound-files').' '.$this->translation->_(
                     'mm_SoundFiles'
                 ),
             'value'         => $this->url->get('sound-files'),
@@ -174,7 +174,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('licensing') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('licensing').' '.$this->translation->_(
                     'mm_Licensing'
                 ),
             'value'         => $this->url->get('licensing/modify/'),
@@ -184,7 +184,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('pbx-extension-modules') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('pbx-extension-modules').' '.$this->translation->_(
                     'BreadcrumbPbxExtensionModules'
                 ),
             'value'         => $this->url->get('pbx-extension-modules'),
@@ -194,7 +194,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('system-diagnostic') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('system-diagnostic').' '.$this->translation->_(
                     'mm_SystemDiagnostic'
                 ),
             'value'         => $this->url->get('system-diagnostic'),
@@ -204,7 +204,7 @@ 
         ];
 
         $items[] = [
-            'name'          => $elements->getIconByController('fail2-ban') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('fail2-ban').' '.$this->translation->_(
                     'mm_BruteForceProtection'
                 ),
             'value'         => $this->url->get('fail2-ban'),
@@ -213,7 +213,7 @@ 
             'sorter'        => strip_tags($this->translation->_('mm_BruteForceProtection')),
         ];
         $items[] = [
-            'name'          => $elements->getIconByController('update') . ' ' . $this->translation->_(
+            'name'          => $elements->getIconByController('update').' '.$this->translation->_(
                     'mm_UpdateSystem'
                 ),
             'value'         => $this->url->get('update'),