#784 Поправил переопределение dst_num

mikopbx · Oct 31, 2024 · 878b75e · 878b75e
1 parent 298dd43
commit 878b75e
Showing 1 changed file with 3 additions and 79 deletions.
diff --git a/src/Core/Asterisk/Configs/Generators/Extensions/OutgoingContext.php b/src/Core/Asterisk/Configs/Generators/Extensions/OutgoingContext.php
@@ -215,80 +215,6 @@ private function generateOutgoingRegexPattern(array $rout): string
      */
     private function generateProviderContext(string &$conf, string $id_dialplan, array $rout): void
     {
-        // Add context header
-        $conf .= "\n[$id_dialplan]\n";
-
-        // Initialize variables for extensionVar and changeExtension
-        [$extensionVar, $changeExtension] = $this->initTrimVariables($rout);
-
-
-        // Set number variable with prepend and extensionVar
-        $conf .= 'exten => ' . ExtensionsConf::ALL_NUMBER_EXTENSION . ',1,Set(number=' . $rout['prepend'] . $extensionVar . ')' . "\n\t";
-
-        // Filter number using regex pattern
-        $conf .= 'same => n,Set(number=${FILTER(\*\#\+1234567890,${number})})' . "\n\t";
-
-        $conf .= $changeExtension;
-
-        // Hangup if number is empty
-        $conf .= 'same => n,ExecIf($["${number}x" == "x"]?Hangup())' . "\n\t";
-
-        // Set ROUTFOUND and PROVIDER_ID variables
-        $conf .= 'same => n,Set(ROUTFOUND=1)' . "\n\t";
-        $conf .= "same => n,Set(_PROVIDER_ID={$rout['providerid']})" . "\n\t";
-
-        // Set DOPTIONS based on EXTERNALPHONE and src_number
-        $conf .= 'same => n,ExecIf($["${EXTERNALPHONE}" == "${src_number}"]?Set(DOPTIONS=tk))' . "\n\t";
-
-        // Get dial command based on routing data
-        $dialCommand = $this->getDialCommand($rout);
-
-        // Set DIAL_COMMAND variable
-        $conf .= 'same => n,Set(DIAL_COMMAND=' . $dialCommand . ')' . "\n\t";
-        $conf .= 'same => n,ExecIf($["${DEF_DIAL_COMMAND}x" != "x"]?Set(DIAL_COMMAND=${DEF_DIAL_COMMAND}))' . "\n\t";
-
-        // Customize all-outgoing context
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(all-outgoing-custom,${EXTEN},1)}" == "1"]?all-outgoing-custom,${EXTEN},1)' . "\n\t";
-
-        // Describing the ability to jump to a custom sub-context.
-        // Customize provider-specific outgoing context
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)}" == "1"]?' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)' . "\n\t";
-
-        // Return if NEED_RETURN is set
-        $conf .= 'same => n,ExecIf($["${NEED_RETURN}" == "1"]?return)' . "\n\t";
-
-        // Generating outgoing dialplan for additional modules; overriding the route's dialplan.
-        $confModules = $this->hookModulesMethod(AsteriskConfigInterface::GENERATE_OUT_ROUT_CONTEXT, [$rout]);
-        if (!empty($confModules)) {
-            $conf .= trim($confModules) . "\n\t";
-        }
-        // Execute dial based on ISTRANSFER
-        $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t";
-
-        $conf .= 'same => n,ExecIf($["${OFF_ANSWER_SUB}" != "1"]?Set(DIAL_OUT_ANSWER_OPTIONS=U(${ISTRANSFER}dial_answer)))' . "\n\t";
-        $conf .= 'same => n,Dial(${DIAL_COMMAND},600,${DOPTIONS}TK${DIAL_OUT_ANSWER_OPTIONS}b(dial_create_chan,s,1))' . "\n\t";
-        // Generate outgoing dialplan for additional modules
-        $confModules = $this->hookModulesMethod(AsteriskConfigInterface::GENERATE_OUT_ROUT_AFTER_DIAL_CONTEXT, [$rout]);
-        if (!empty($confModules)) {
-            $conf .= trim($confModules) . "\n\t";
-        }
-
-        // Customize provider-specific outgoing context after Dial command
-        $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(' . $rout['providerid'] . '-outgoing-after-dial-custom,${EXTEN}),1}" == "1"]?' . $rout['providerid'] . '-outgoing-after-dial-custom,${EXTEN},1)' . "\n\t";
-
-        // Perform transfer_dial_hangup if ISTRANSFER is set
-        $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(transfer_dial_hangup,${EXTEN},1))' . "\n\t";
-
-        // Hangup if DIALSTATUS is ANSWER
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "ANSWER"]?Hangup())' . "\n\t";
-
-        // Handle BUSY condition
-        $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "BUSY"]?Busy(2))' . "\n\t";
-
-        // Set pt1c_UNIQUEID to empty value
-        $conf .= 'same => n,Set(pt1c_UNIQUEID=${EMPTY_VALUE})' . "\n\t";
-
-        $conf .= 'same => n,return' . "\n";
     }
 
     /**
@@ -299,20 +225,18 @@ private function generateProviderContext(string &$conf, string $id_dialplan, arr
      * extension configuration accordingly. The variables are returned as an array.
      *
      * @param array $rout The routing data.
-     * @return string[] The extension variable and change extension configuration.
+     * @return string The extension variable and change extension configuration.
      */
-    private function initTrimVariables(array $rout): array
+    private function initTrimVariables(array $rout): string
     {
         $trimFromBegin = (int)($rout['trimfrombegin'] ?? 0);
         if ($trimFromBegin > 0) {
             $extensionVar    = '${EXTEN:' . $rout['trimfrombegin'] . '}';
-            $changeExtension = 'same => n,ExecIf($["${EXTEN}" != "${number}"]?Goto(${CONTEXT},${number},$[${PRIORITY} + 1]))' . "\n\t";
         } else {
             $extensionVar    = '${EXTEN}';
-            $changeExtension = '';
         }
 
-        return [$extensionVar, $changeExtension];
+        return $extensionVar;
     }
 
     /**