mikopbx / Core

src/Common/Models/ModelsBase.php

Indentation +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
                     . '= :field'
                     . $index . ':';
                 $bindField
-                                                      = $mappedFields[$index];
+                                                        = $mappedFields[$index];
                 $parameters['bind']['field' . $index] = $currentDeleteRecord->$bindField;
             }
             $relatedRecords = $relatedModel::find($parameters);

Spacing +59 added lines, -59 removed lines

@@ -69,12 +69,12 @@ 
                 'lifetime' => 5, //seconds
             ],
         ];
-        $modules    = PbxExtensionModules::find($parameters)->toArray();
+        $modules = PbxExtensionModules::find($parameters)->toArray();
         foreach ($modules as $module) {
             $moduleDir = PbxExtensionUtils::getModuleDir($module['uniqid']);
 
             $moduleJson = "{$moduleDir}/module.json";
-            if ( ! file_exists($moduleJson)) {
+            if (!file_exists($moduleJson)) {
                 continue;
             }
             $jsonString            = file_get_contents($moduleJson);
@@ -85,7 +85,7 @@ 
             }
 
             $moduleModelsDir = "{$moduleDir}/Models";
-            $results         = glob($moduleModelsDir . '/*.php', GLOB_NOSORT);
+            $results         = glob($moduleModelsDir.'/*.php', GLOB_NOSORT);
             foreach ($results as $file) {
                 $className        = pathinfo($file)['filename'];
                 $moduleModelClass = "\\Modules\\{$module['uniqid']}\\Models\\{$className}";
@@ -120,16 +120,16 @@ 
                 $newErrorMessage = $this->t('ConstraintViolation');
                 $newErrorMessage .= "<ul class='list'>";
                 if ($relatedRecords === false) {
-                    throw new Model\Exception('Error on models relationship ' . $errorMessage);
+                    throw new Model\Exception('Error on models relationship '.$errorMessage);
                 }
                 if ($relatedRecords instanceof Resultset) {
                     foreach ($relatedRecords as $item) {
                         if ($item instanceof ModelsBase) {
-                            $newErrorMessage .= '<li>' . $item->getRepresent(true) . '</li>';
+                            $newErrorMessage .= '<li>'.$item->getRepresent(true).'</li>';
                         }
                     }
                 } elseif ($relatedRecords instanceof ModelsBase) {
-                    $newErrorMessage .= '<li>' . $relatedRecords->getRepresent(true) . '</li>';
+                    $newErrorMessage .= '<li>'.$relatedRecords->getRepresent(true).'</li>';
                 } else {
                     $newErrorMessage .= '<li>Unknown object</li>';
                 }
@@ -180,7 +180,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementCallQueues');
                 } else {
-                    $name .= $this->t('mo_CallQueueShort4Dropdown') . ': ' . $this->name;
+                    $name .= $this->t('mo_CallQueueShort4Dropdown').': '.$this->name;
                 }
                 break;
             case ConferenceRooms::class:
@@ -188,7 +188,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementConferenceRooms');
                 } else {
-                    $name .= $this->t('mo_ConferenceRoomsShort4Dropdown') . ': ' . $this->name;;
+                    $name .= $this->t('mo_ConferenceRoomsShort4Dropdown').': '.$this->name; ;
                 }
                 break;
             case CustomFiles::class:
@@ -199,7 +199,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementDialplanApplications');
                 } else {
-                    $name .= $this->t('mo_ApplicationShort4Dropdown') . ': ' . $this->name;;
+                    $name .= $this->t('mo_ApplicationShort4Dropdown').': '.$this->name; ;
                 }
                 break;
             case ExtensionForwardingRights::class:
@@ -261,7 +261,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementIax');
                 } elseif ($this->disabled === '1') {
-                    $name .= "{$this->description} ({$this->t( 'mo_Disabled' )})";
+                    $name .= "{$this->description} ({$this->t('mo_Disabled')})";
                 } else {
                     $name .= $this->description;
                 }
@@ -271,7 +271,7 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementIvrMenu');
                 } else {
-                    $name .= $this->t('mo_IVRMenuShort4Dropdown') . ': ' . $this->name;
+                    $name .= $this->t('mo_IVRMenuShort4Dropdown').': '.$this->name;
                 }
                 break;
             case IvrMenuActions::class:
@@ -284,7 +284,7 @@ 
                 $name = '<i class="map signs icon"></i> ';
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementIncomingRoutingTable');
-                } elseif ( ! empty($this->note)) {
+                } elseif (!empty($this->note)) {
                     $name .= $this->t('repIncomingRoutingTable', ['represent' => $this->note]);
                 } else {
                     $name .= $this->t('repIncomingRoutingTableNumber', ['represent' => $this->id]);
@@ -299,8 +299,8 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementNetworkFilters');
                 } else {
-                    $name .= $this->description . '('
-                        . $this->t('fw_PermitNetwork') . ': ' . $this->permit
+                    $name .= $this->description.'('
+                        . $this->t('fw_PermitNetwork').': '.$this->permit
                         . ')';
                 }
                 break;
@@ -308,7 +308,7 @@ 
                 $name = '<i class="random icon"></i> ';
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementOutgoingRoutingTable');
-                } elseif ( ! empty($this->rulename)) {
+                } elseif (!empty($this->rulename)) {
                     $name .= $this->t('repOutgoingRoutingTable', ['represent' => $this->rulename]);
                 } else {
                     $name .= $this->t('repOutgoingRoutingTableNumber', ['represent' => $this->id]);
@@ -318,24 +318,24 @@ 
                 $name = '<i class="time icon"></i> ';
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementOutWorkTimes');
-                } elseif ( ! empty($this->description)) {
+                } elseif (!empty($this->description)) {
                     $name .= $this->t('repOutWorkTimes', ['represent' => $this->description]);
                 } else {
                     $represent = '';
                     if (is_numeric($this->date_from)) {
-                        $represent .= date("d/m/Y", $this->date_from) . '-';
+                        $represent .= date("d/m/Y", $this->date_from).'-';
                     }
                     if (is_numeric($this->date_to)) {
-                        $represent .= date("d/m/Y", $this->date_to) . ' ';
+                        $represent .= date("d/m/Y", $this->date_to).' ';
                     }
                     if (isset($this->weekday_from)) {
-                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_from} days"))) . '-';
+                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_from} days"))).'-';
                     }
                     if (isset($this->weekday_to)) {
-                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_to} days"))) . ' ';
+                        $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_to} days"))).' ';
                     }
                     if (isset($this->time_from) || isset($this->time_to)) {
-                        $represent .= $this->time_from . ' - ' . $this->time_to . ' ';
+                        $represent .= $this->time_from.' - '.$this->time_to.' ';
                     }
                     $name .= $this->t('repOutWorkTimes', ['represent' => $represent]);
                 }
@@ -352,7 +352,7 @@ 
                 break;
             case PbxExtensionModules::class:
                 $name = '<i class="puzzle piece icon"></i> '
-                    . $this->t('mo_ModuleShort4Dropdown') . ': '
+                    . $this->t('mo_ModuleShort4Dropdown').': '
                     . $this->name;
                 break;
             case Sip::class:
@@ -360,14 +360,14 @@ 
                 if (empty($this->id)) {
                     $name .= $this->t('mo_NewElementSip');
                 } elseif ($this->disabled === '1') {
-                    $name .= "{$this->description} ({$this->t( 'mo_Disabled' )})";
+                    $name .= "{$this->description} ({$this->t('mo_Disabled')})";
                 } else {
                     $name .= $this->description;
                 }
 
                 break;
             case Users::class:
-                $name = '<i class="user outline icon"></i> ' . $this->username;
+                $name = '<i class="user outline icon"></i> '.$this->username;
                 break;
             case SoundFiles::class:
                 $name = '<i class="file audio outline icon"></i> ';
@@ -386,7 +386,7 @@ 
             $link     = $this->getWebInterfaceLink();
             $category = explode('\\', static::class)[3];
             $result   = $this->t(
-                'rep' . $category,
+                'rep'.$category,
                 [
                     'represent' => "<a href='{$link}'>{$name}</a>",
                 ]
@@ -411,7 +411,7 @@ 
 
         if (strlen($s) > $max_length) {
             $offset = ($max_length - 3) - strlen($s);
-            $s      = substr($s, 0, strrpos($s, ' ', $offset)) . '...';
+            $s      = substr($s, 0, strrpos($s, ' ', $offset)).'...';
         }
 
         return $s;
@@ -430,80 +430,80 @@ 
         $link    = '#';
         switch (static::class) {
             case AsteriskManagerUsers::class:
-                $link = $url->get('asterisk-managers/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('asterisk-managers/modify/'.$this->id, null, null, $baseUri);
                 break;
             case CallQueueMembers::class:
-                $link = $url->get('call-queues/modify/' . $this->CallQueues->uniqid, null, null, $baseUri);
+                $link = $url->get('call-queues/modify/'.$this->CallQueues->uniqid, null, null, $baseUri);
                 break;
             case CallQueues::class:
-                $link = $url->get('call-queues/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('call-queues/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case ConferenceRooms::class:
-                $link = $url->get('conference-rooms/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('conference-rooms/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case CustomFiles::class:
-                $link = $url->get('custom-files/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('custom-files/modify/'.$this->id, null, null, $baseUri);
                 break;
             case DialplanApplications::class:
-                $link = $url->get('dialplan-applications/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('dialplan-applications/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case ExtensionForwardingRights::class:
 
                 break;
             case Extensions::class:
-                $link = $url->get('extensions/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('extensions/modify/'.$this->id, null, null, $baseUri);
                 break;
             case ExternalPhones::class:
                 if ($this->Extensions->is_general_user_number === "1") {
-                    $parameters    = [
-                        'conditions' => 'is_general_user_number="1" AND type="' . Extensions::TYPE_EXTERNAL . '" AND userid=:userid:',
+                    $parameters = [
+                        'conditions' => 'is_general_user_number="1" AND type="'.Extensions::TYPE_EXTERNAL.'" AND userid=:userid:',
                         'bind'       => [
                             'userid' => $this->Extensions->userid,
                         ],
                     ];
                     $needExtension = Extensions::findFirst($parameters);
-                    $link          = $url->get('extensions/modify/' . $needExtension->id, null, null, $baseUri);
+                    $link          = $url->get('extensions/modify/'.$needExtension->id, null, null, $baseUri);
                 } else {
-                    $link = '#';//TODO сделать если будет раздел для допоплнинельных номеров пользователя
+                    $link = '#'; //TODO сделать если будет раздел для допоплнинельных номеров пользователя
                 }
                 break;
             case Fail2BanRules::class:
-                $link = '#';//TODO сделать если будет fail2ban
+                $link = '#'; //TODO сделать если будет fail2ban
                 break;
             case FirewallRules::class:
-                $link = $url->get('firewall/modify/' . $this->NetworkFilters->id, null, null, $baseUri);
+                $link = $url->get('firewall/modify/'.$this->NetworkFilters->id, null, null, $baseUri);
                 break;
             case Iax::class:
-                $link = $url->get('providers/modifyiax/' . $this->Providers->id, null, null, $baseUri);
+                $link = $url->get('providers/modifyiax/'.$this->Providers->id, null, null, $baseUri);
                 break;
             case IvrMenu::class:
-                $link = $url->get('ivr-menu/modify/' . $this->uniqid, null, null, $baseUri);
+                $link = $url->get('ivr-menu/modify/'.$this->uniqid, null, null, $baseUri);
                 break;
             case IvrMenuActions::class:
-                $link = $url->get('ivr-menu/modify/' . $this->IvrMenu->uniqid, null, null, $baseUri);
+                $link = $url->get('ivr-menu/modify/'.$this->IvrMenu->uniqid, null, null, $baseUri);
                 break;
             case Codecs::class:
                 break;
             case IncomingRoutingTable::class:
-                $link = $url->get('incoming-routes/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('incoming-routes/modify/'.$this->id, null, null, $baseUri);
                 break;
             case LanInterfaces::class:
                 $link = $url->get('network/index/', null, null, $baseUri);
                 break;
             case NetworkFilters::class:
-                $link = $url->get('firewall/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('firewall/modify/'.$this->id, null, null, $baseUri);
                 break;
             case OutgoingRoutingTable::class:
-                $link = $url->get('outbound-routes/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('outbound-routes/modify/'.$this->id, null, null, $baseUri);
                 break;
             case OutWorkTimes::class:
-                $link = $url->get('out-off-work-time/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('out-off-work-time/modify/'.$this->id, null, null, $baseUri);
                 break;
             case Providers::class:
                 if ($this->type === "IAX") {
-                    $link = $url->get('providers/modifyiax/' . $this->uniqid, null, null, $baseUri);
+                    $link = $url->get('providers/modifyiax/'.$this->uniqid, null, null, $baseUri);
                 } else {
-                    $link = $url->get('providers/modifysip/' . $this->uniqid, null, null, $baseUri);
+                    $link = $url->get('providers/modifysip/'.$this->uniqid, null, null, $baseUri);
                 }
                 break;
             case PbxSettings::class:
@@ -515,26 +515,26 @@ 
             case Sip::class:
                 if ($this->Extensions) { // Это внутренний номер?
                     if ($this->Extensions->is_general_user_number === "1") {
-                        $link = $url->get('extensions/modify/' . $this->Extensions->id, null, null, $baseUri);
+                        $link = $url->get('extensions/modify/'.$this->Extensions->id, null, null, $baseUri);
                     } else {
-                        $link = '#';//TODO сделать если будет раздел для допоплнинельных номеров пользователя
+                        $link = '#'; //TODO сделать если будет раздел для допоплнинельных номеров пользователя
                     }
                 } elseif ($this->Providers) { // Это провайдер
-                    $link = $url->get('providers/modifysip/' . $this->Providers->id, null, null, $baseUri);
+                    $link = $url->get('providers/modifysip/'.$this->Providers->id, null, null, $baseUri);
                 }
                 break;
             case Users::class:
-                $parameters    = [
+                $parameters = [
                     'conditions' => 'userid=:userid:',
                     'bind'       => [
                         'userid' => $this->id,
                     ],
                 ];
                 $needExtension = Extensions::findFirst($parameters);
-                $link          = $url->get('extensions/modify/' . $needExtension->id, null, null, $baseUri);
+                $link          = $url->get('extensions/modify/'.$needExtension->id, null, null, $baseUri);
                 break;
             case SoundFiles::class:
-                $link = $url->get('sound-files/modify/' . $this->id, null, null, $baseUri);
+                $link = $url->get('sound-files/modify/'.$this->id, null, null, $baseUri);
                 break;
             default:
         }
@@ -550,7 +550,7 @@ 
         $metaData      = $this->di->get('modelsMetadata');
         $defaultValues = $metaData->getDefaultValues($this);
         foreach ($defaultValues as $field => $value) {
-            if ( ! isset($this->{$field})) {
+            if (!isset($this->{$field})) {
                 $this->{$field} = $value;
             }
         }
@@ -684,7 +684,7 @@ 
                 = $currentDeleteRecord->_modelsManager->getRelations(get_class($currentDeleteRecord));
         foreach ($relations as $relation) {
             $foreignKey = $relation->getOption('foreignKey');
-            if ( ! array_key_exists('action', $foreignKey)) {
+            if (!array_key_exists('action', $foreignKey)) {
                 continue;
             }
             // Check if there are some record which restrict delete current record
@@ -702,10 +702,10 @@ 
                     ? ' OR ' : '';
                 $parameters['conditions']             .= $referencedField
                     . '= :field'
-                    . $index . ':';
+                    . $index.':';
                 $bindField
                                                       = $mappedFields[$index];
-                $parameters['bind']['field' . $index] = $currentDeleteRecord->$bindField;
+                $parameters['bind']['field'.$index] = $currentDeleteRecord->$bindField;
             }
             $relatedRecords = $relatedModel::find($parameters);
             switch ($foreignKey['action']) {
@@ -778,7 +778,7 @@ 
     private function processSettingsChanges(string $action): void
     {
         if (php_sapi_name() !== 'cli') {
-            if ( ! $this->hasSnapshotData()) {
+            if (!$this->hasSnapshotData()) {
                 return;
             } // nothing changed
 

src/Modules/PbxExtensionState.php

Spacing +19 added lines, -19 removed lines

@@ -41,16 +41,16 @@ 
         $this->moduleUniqueID = $moduleUniqueID;
         $this->modulesRoot    = $this->getDI()->getShared('config')->path('core.modulesDir');
         $moduleJson           = "{$this->modulesRoot}/{$this->moduleUniqueID}/module.json";
-        if ( ! file_exists($moduleJson)) {
-            $this->messages[] = 'module.json not found for module ' . $this->moduleUniqueID;
+        if (!file_exists($moduleJson)) {
+            $this->messages[] = 'module.json not found for module '.$this->moduleUniqueID;
 
             return;
         }
 
         $jsonString            = file_get_contents($moduleJson);
         $jsonModuleDescription = json_decode($jsonString, true);
-        if ( ! is_array($jsonModuleDescription)) {
-            $this->messages[] = 'module.json parsing error ' . $this->moduleUniqueID;
+        if (!is_array($jsonModuleDescription)) {
+            $this->messages[] = 'module.json parsing error '.$this->moduleUniqueID;
 
             return;
         }
@@ -93,13 +93,13 @@ 
             }
         }
         $success = $this->makeBeforeEnableTest();
-        if ( ! $success) {
+        if (!$success) {
             return false;
         }
 
         $this->reloadConfigClass();
         // Если ошибок нет, включаем Firewall и модуль
-        if ( ! $this->enableFirewallSettings()) {
+        if (!$this->enableFirewallSettings()) {
             $this->messages[] = 'Error on enable firewall settings';
 
             return false;
@@ -180,7 +180,7 @@ 
                 if (array_key_exists($network->id, $previousRules)) {
                     $newRule->action = $previousRules[$network->id];
                 }
-                if ( ! $newRule->save()) {
+                if (!$newRule->save()) {
                     $this->messages[] = $newRule->getMessages();
                 }
             }
@@ -207,7 +207,7 @@ 
     {
         if ($this->configClass !== null
             && method_exists($this->configClass, 'createNginxLocations')
-            && ! empty($this->configClass->createNginxLocations())) {
+            && !empty($this->configClass->createNginxLocations())) {
             $nginxConf = new NginxConf();
             $nginxConf->generateModulesConf();
             $nginxConf->reStart();
@@ -224,7 +224,7 @@ 
     {
         if ($this->configClass !== null
             && method_exists($this->configClass, 'generateFail2BanJails')
-            && ! empty($this->configClass->generateFail2BanJails())) {
+            && !empty($this->configClass->generateFail2BanJails())) {
             IptablesConf::reloadFirewall();
         }
     }
@@ -236,12 +236,12 @@ 
     public function disableModule(): bool
     {
         $success = $this->makeBeforeDisableTest();
-        if ( ! $success) {
+        if (!$success) {
             return false;
         }
         $this->reloadConfigClass();
         // Если ошибок нет, выключаем Firewall и модуль
-        if ( ! $this->disableFirewallSettings()) {
+        if (!$this->disableFirewallSettings()) {
             $this->messages[] = 'Error on disable firewall settings';
 
             return false;
@@ -300,7 +300,7 @@ 
             && method_exists($this->configClass, 'onBeforeModuleDisable')
             && $this->configClass->onBeforeModuleDisable() === false) {
             $messages = $this->configClass->getMessages();
-            if ( ! empty($messages)) {
+            if (!empty($messages)) {
                 $this->messages = $messages;
             } else {
                 $this->messages[] = 'Error on the Module enable function at onBeforeModuleDisable';
@@ -318,7 +318,7 @@ 
             $className        = pathinfo($file)['filename'];
             $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}";
             try {
-                if ( ! class_exists($moduleModelClass)) {
+                if (!class_exists($moduleModelClass)) {
                     continue;
                 }
                 $reflection = new ReflectionClass($moduleModelClass);
@@ -330,7 +330,7 @@ 
                 }
                 $records = $moduleModelClass::find();
                 foreach ($records as $record) {
-                    if ( ! $record->beforeDelete()) {
+                    if (!$record->beforeDelete()) {
                         foreach ($record->getMessages() as $message) {
                             $this->messages[] = $message->getMessage();
                         }
@@ -382,7 +382,7 @@ 
             $savedState[$detailRule->networkfilterid] = $detailRule->action;
         }
         $this->db->begin(true);
-        if ( ! $currentRules->delete()) {
+        if (!$currentRules->delete()) {
             $this->messages[] = $currentRules->getMessages();
 
             return false;
@@ -394,7 +394,7 @@ 
             $previousRuleSettings->key = "{$this->moduleUniqueID}FirewallSettings";
         }
         $previousRuleSettings->value = json_encode($savedState);
-        if ( ! $previousRuleSettings->save()) {
+        if (!$previousRuleSettings->save()) {
             $this->messages[] = $previousRuleSettings->getMessages();
         }
         if (count($errors) > 0) {
@@ -447,7 +447,7 @@ 
             && method_exists($this->configClass, 'onBeforeModuleEnable')
             && $this->configClass->onBeforeModuleEnable() === false) {
             $messages = $this->configClass->getMessages();
-            if ( ! empty($messages)) {
+            if (!empty($messages)) {
                 $this->messages = $messages;
             } else {
                 $this->messages[] = 'Error on the enableModule function at onBeforeModuleEnable';
@@ -467,7 +467,7 @@ 
             $moduleModelClass = "\\Modules\\{$this->moduleUniqueID}\\Models\\{$className}";
 
             try {
-                if ( ! class_exists($moduleModelClass)) {
+                if (!class_exists($moduleModelClass)) {
                     continue;
                 }
                 $reflection = new ReflectionClass($moduleModelClass);
@@ -497,7 +497,7 @@ 
                                     'modulename' => $record->getRepresent(true),
                                 ]
                             );
-                            $success          = false;
+                            $success = false;
                         }
                     }
                 }

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

@@ -69,7 +69,7 @@ 
     private function reloadConfigClass(): void
     {
         $class_name      = str_replace('Module', '', $this->moduleUniqueID);
-        $configClassName = "\\Modules\\{$this->moduleUniqueID}\\Lib\\{$class_name}Conf";
+        $configClassName = "\\Modules\\{$this->moduleUniqueID}\\Lib\\{$class_name}conf";
         if (class_exists($configClassName)) {
             $this->configClass = new $configClassName();
         } else {
@@ -151,7 +151,7 @@ 
 
         $this->db->begin(true);
         $defaultRules         = $this->configClass->getDefaultFirewallRules();
-        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}FirewallSettings");
+        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}firewallsettings");
         $previousRules        = [];
         if ($previousRuleSettings !== null) {
             $previousRules = json_decode($previousRuleSettings->value, true);
@@ -388,10 +388,10 @@ 
             return false;
         }
 
-        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}FirewallSettings");
+        $previousRuleSettings = PbxSettings::findFirstByKey("{$this->moduleUniqueID}firewallsettings");
         if ($previousRuleSettings === null) {
             $previousRuleSettings      = new PbxSettings();
-            $previousRuleSettings->key = "{$this->moduleUniqueID}FirewallSettings";
+            $previousRuleSettings->key = "{$this->moduleUniqueID}firewallsettings";
         }
         $previousRuleSettings->value = json_encode($savedState);
         if ( ! $previousRuleSettings->save()) {

src/Modules/PbxExtensionUtils.php

Spacing +4 added lines, -4 removed lines

@@ -114,7 +114,7 @@ 
         $moduleAgiBinDir = "{$moduleDir}/agi-bin";
         $files           = glob("$moduleAgiBinDir/*.{php}", GLOB_BRACE);
         foreach ($files as $file) {
-            $newFilename = $agiBinDir . '/' . basename($file);
+            $newFilename = $agiBinDir.'/'.basename($file);
             Util::createUpdateSymlink($file, $newFilename);
         }
 
@@ -135,7 +135,7 @@ 
             $needDisable = false;
             $moduleDir   = PbxExtensionUtils::getModuleDir($module['uniqid']);
             $moduleJson  = "{$moduleDir}/module.json";
-            if ( ! file_exists($moduleJson)) {
+            if (!file_exists($moduleJson)) {
                 $needDisable = true;
             }
             $jsonString            = file_get_contents($moduleJson);
@@ -151,8 +151,8 @@ 
                 } catch (ErrorAlias $exception) {
                     Util::sysLogMsg(__CLASS__, "Can not disable module {$module['uniqid']} Message: {$exception}");
                 } finally {
-                    $currentModule           = PbxExtensionModules::findFirstByUniqid($module['uniqid']);
-                    if ($currentModule->disabled==='0'){
+                    $currentModule = PbxExtensionModules::findFirstByUniqid($module['uniqid']);
+                    if ($currentModule->disabled === '0') {
                         $currentModule->disabled = '1';
                         $currentModule->update();
                     }

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

Spacing +18 added lines, -18 removed lines

@@ -78,7 +78,7 @@ 
             'slin'  => 'Signed Linear PCM',
             'opus'  => 'Opus',
         ];
-        $codecs      = Codecs::find();
+        $codecs = Codecs::find();
         // Удалим лишние кодеки
         /** @var Codecs $codec */
         foreach ($codecs as $codec) {
@@ -86,10 +86,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'
                 );
             }
         }
@@ -104,7 +104,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();
         }
@@ -118,7 +118,7 @@ 
     private function addNewCodecs($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) {
@@ -133,10 +133,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'
                 );
             }
         }
@@ -188,12 +188,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 (\Error $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();
@@ -206,12 +206,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;
         }
 
@@ -220,9 +220,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();
@@ -286,7 +286,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';
@@ -301,14 +301,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();