Исправил не корректное сохранение SIP пира, в поле type сохранялось з…

…начение "SIP", а должно было "peer", в итоге не создавались endpoint в pjsip.conf
mikopbx · Oct 10, 2024 · f516e46 · f516e46
1 parent ab020fb
commit f516e46
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/AdminCabinet/Forms/ExtensionEditForm.php b/src/AdminCabinet/Forms/ExtensionEditForm.php
@@ -104,7 +104,7 @@ public function initialize($entity = null, $options = null): void
         $this->add(new Hidden('sip_extension', ["value" => $entity->number]));
 
         // SIP Type
-        $this->add(new Hidden('sip_type', ["value" => $entity->type]));
+        $this->add(new Hidden('sip_type', ["value" => $entity->sip_type]));
 
         // SIP Secret
         $this->add(

diff --git a/src/Core/Asterisk/Configs/SIPConf.php b/src/Core/Asterisk/Configs/SIPConf.php
@@ -182,9 +182,9 @@ private function getTopologyData(): array
                 $subnets[] = $net;
             }
             if (trim($if_data['internet']) === '1') {
-                $topology    = trim($if_data['topology']);
-                $extipaddr   = trim($if_data['extipaddr']);
-                $exthostname = trim($if_data['exthostname']);
+                $topology    = trim($if_data['topology']??'');
+                $extipaddr   = trim($if_data['extipaddr']??'');
+                $exthostname = trim($if_data['exthostname']??'');
             }
         }
 
@@ -599,11 +599,11 @@ public function updateAsteriskDatabase(): bool
         $db = new AstDB();
         foreach ($this->data_peers as $peer) {
             // Update Asterisk database with routing information.
-            $ringLength = ((string)$peer['ringlength'] === '0') ? '' : trim($peer['ringlength']);
+            $ringLength = ((string)$peer['ringlength'] === '0') ? '' : trim($peer['ringlength']??'');
             $warError |= !$db->databasePut('FW_TIME', $peer['extension'], $ringLength);
-            $warError |= !$db->databasePut('FW', $peer['extension'], trim($peer['forwarding']));
-            $warError |= !$db->databasePut('FW_BUSY', $peer['extension'], trim($peer['forwardingonbusy']));
-            $warError |= !$db->databasePut('FW_UNAV', $peer['extension'], trim($peer['forwardingonunavailable']));
+            $warError |= !$db->databasePut('FW', $peer['extension'], trim($peer['forwarding']??''));
+            $warError |= !$db->databasePut('FW_BUSY', $peer['extension'], trim($peer['forwardingonbusy']??''));
+            $warError |= !$db->databasePut('FW_UNAV', $peer['extension'], trim($peer['forwardingonunavailable']??''));
         }
 
         return !$warError;
@@ -1281,7 +1281,7 @@ private function generatePeerEndpoint(
         }
 
         $dtmfmode = ($peer['dtmfmode'] === 'rfc2833') ? 'rfc4733' : $peer['dtmfmode'];
-        $peer['transport'] = trim($peer['transport']);
+        $peer['transport'] = trim($peer['transport']??'');
         // Prepare the options for the endpoint section
         $options  = [
             'type'                 => 'endpoint',

diff --git a/src/PBXCoreREST/Lib/Extensions/GetRecordAction.php b/src/PBXCoreREST/Lib/Extensions/GetRecordAction.php
@@ -75,6 +75,7 @@ public static function main(string $id): PBXApiResult
                 'sip_dtmfmode' => 'Sip.dtmfmode',
                 'sip_manualattributes' => 'Sip.manualattributes',
                 'sip_uniqid' => 'Sip.uniqid',
+                'sip_type' => 'Sip.type',
                 'sip_secret' => 'Sip.secret',
                 'sip_networkfilterid' => 'Sip.networkfilterid',
                 'sip_transport' => 'Sip.transport'