mikopbx /
Core
@@ -18,13 +18,13 @@ |
||
| 18 | 18 | |
| 19 | 19 | protected function generateConfigProtected(): void |
| 20 | 20 | { |
| 21 | - $conf = "[general]\n" . |
|
| 22 | - "enable=yes\n" . |
|
| 23 | - "unanswered=yes\n\n" . |
|
| 24 | - "[sqlite]\n" . |
|
| 25 | - "usegmtime=no\n" . |
|
| 26 | - "loguniqueid=yes\n" . |
|
| 21 | + $conf = "[general]\n". |
|
| 22 | + "enable=yes\n". |
|
| 23 | + "unanswered=yes\n\n". |
|
| 24 | + "[sqlite]\n". |
|
| 25 | + "usegmtime=no\n". |
|
| 26 | + "loguniqueid=yes\n". |
|
| 27 | 27 | "loguserfield=yes\n"; |
| 28 | - file_put_contents($this->config->path('asterisk.astetcdir') . '/cdr.conf', $conf); |
|
| 28 | + file_put_contents($this->config->path('asterisk.astetcdir').'/cdr.conf', $conf); |
|
| 29 | 29 | } |
| 30 | 30 | } |
| 31 | 31 | \ No newline at end of file |
@@ -19,10 +19,10 @@ |
||
| 19 | 19 | |
| 20 | 20 | protected function generateConfigProtected(): void |
| 21 | 21 | { |
| 22 | - $conf = "[general]\n" . |
|
| 23 | - "rtpstart={$this->generalSettings['RTPPortFrom']}\n" . |
|
| 22 | + $conf = "[general]\n". |
|
| 23 | + "rtpstart={$this->generalSettings['RTPPortFrom']}\n". |
|
| 24 | 24 | "rtpend={$this->generalSettings['RTPPortTo']}\n\n"; |
| 25 | 25 | |
| 26 | - Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/rtp.conf', $conf); |
|
| 26 | + Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/rtp.conf', $conf); |
|
| 27 | 27 | } |
| 28 | 28 | } |
| 29 | 29 | \ No newline at end of file |
@@ -19,6 +19,6 @@ |
||
| 19 | 19 | protected function generateConfigProtected(): void |
| 20 | 20 | { |
| 21 | 21 | $conf = ''; |
| 22 | - file_put_contents($this->config->path('asterisk.astetcdir') . '/queuerules.conf', $conf); |
|
| 22 | + file_put_contents($this->config->path('asterisk.astetcdir').'/queuerules.conf', $conf); |
|
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | \ No newline at end of file |
@@ -29,12 +29,12 @@ |
||
| 29 | 29 | { |
| 30 | 30 | $this->module_name = $module_name; |
| 31 | 31 | $this->debug = true; |
| 32 | - $logPath = System::getLogDir() . '/' . $this->module_name . '/'; |
|
| 33 | - if (!is_dir($logPath)){ |
|
| 32 | + $logPath = System::getLogDir().'/'.$this->module_name.'/'; |
|
| 33 | + if (!is_dir($logPath)) { |
|
| 34 | 34 | Util::mwMkdir($logPath); |
| 35 | 35 | Util::addRegularWWWRights($logPath); |
| 36 | 36 | } |
| 37 | - $logFile = $logPath . $class . '.log'; |
|
| 37 | + $logFile = $logPath.$class.'.log'; |
|
| 38 | 38 | $adapter = new FileLogger($logFile); |
| 39 | 39 | $this->logger = new \Phalcon\Logger( |
| 40 | 40 | 'messages', |
@@ -60,7 +60,7 @@ |
||
| 60 | 60 | public function callback($parameters): void |
| 61 | 61 | { |
| 62 | 62 | if ($this->replyOnPingRequest($parameters)){ |
| 63 | - return; |
|
| 63 | + return; |
|
| 64 | 64 | } |
| 65 | 65 | |
| 66 | 66 | if ('CdrConnector' !== $parameters['UserEvent']) { |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | */ |
| 62 | 62 | public function callback($parameters): void |
| 63 | 63 | { |
| 64 | - if ($this->replyOnPingRequest($parameters)){ |
|
| 64 | + if ($this->replyOnPingRequest($parameters)) { |
|
| 65 | 65 | return; |
| 66 | 66 | } |
| 67 | 67 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | if ($message_is_sent === false) { |
| 103 | - Util::sysLogMsg('CDR_AMI_Connector', "Error send data to queue. " . $error); |
|
| 103 | + Util::sysLogMsg('CDR_AMI_Connector', "Error send data to queue. ".$error); |
|
| 104 | 104 | } |
| 105 | 105 | // Логируем оповещение. |
| 106 | 106 | Util::logMsgDb('WorkerCallEvents::class', json_decode($result, true)); |
@@ -545,11 +545,11 @@ discard block |
||
| 545 | 545 | $rout_data .= 'same => n,Gosub(add-trim-prefix-clid,${EXTEN},1)' . "\n\t"; |
| 546 | 546 | |
| 547 | 547 | foreach ($additionalModules as $appClass) { |
| 548 | - $addition = $appClass->generateIncomingRoutBeforeDial($rout_number); |
|
| 549 | - if (!empty($addition)){ |
|
| 550 | - $rout_data .=$appClass->confBlockWithComments($addition); |
|
| 551 | - } |
|
| 552 | - } |
|
| 548 | + $addition = $appClass->generateIncomingRoutBeforeDial($rout_number); |
|
| 549 | + if (!empty($addition)){ |
|
| 550 | + $rout_data .=$appClass->confBlockWithComments($addition); |
|
| 551 | + } |
|
| 552 | + } |
|
| 553 | 553 | |
| 554 | 554 | // Перехват на ответственного. |
| 555 | 555 | $rout_data .= 'same => n,UserEvent(Interception,CALLERID: ${CALLERID(num)},chan1c: ${CHANNEL},FROM_DID: ${FROM_DID})' . "\n\t"; |
@@ -612,7 +612,7 @@ discard block |
||
| 612 | 612 | } |
| 613 | 613 | } elseif (is_array($provider)) { |
| 614 | 614 | foreach (array_values($provider) as $_login) { |
| 615 | - $dialplan[$_login] = str_replace('_X!,1', "{$_login},1", $dialplan['X!']); |
|
| 615 | + $dialplan[$_login] = str_replace('_X!,1', "{$_login},1", $dialplan['X!']); |
|
| 616 | 616 | } |
| 617 | 617 | } |
| 618 | 618 | |
@@ -641,7 +641,7 @@ discard block |
||
| 641 | 641 | foreach ($additionalModules as $appClass) { |
| 642 | 642 | $addition = $appClass->generateIncomingRoutAfterDialContext($uniqid); |
| 643 | 643 | if (!empty($addition)){ |
| 644 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 644 | + $conf .=$appClass->confBlockWithComments($addition); |
|
| 645 | 645 | } |
| 646 | 646 | } |
| 647 | 647 | $conf .= " \t" . 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-after-dial-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-after-dial-custom,${EXTEN},1)' . "\n"; |
@@ -575,7 +575,7 @@ discard block |
||
| 575 | 575 | // Вызов будет отвечен сразу конференцией. |
| 576 | 576 | $dial_command = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$rout['extension']},1));"; |
| 577 | 577 | $rout_data_dial[$rout_number] .= ""; |
| 578 | - }else{ |
|
| 578 | + } else{ |
|
| 579 | 579 | $dial_command = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));"; |
| 580 | 580 | $rout_data_dial[$rout_number] .= " \n\t" . "same => n,Set(M_TIMEOUT={$timeout})"; |
| 581 | 581 | } |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | if ($add_login_pattern && array_key_exists('X!', $rout_data_dial) && isset($dialplan['X!'])) { |
| 617 | 617 | $dialplan[$login] = str_replace('_X!,1', "{$login},1", $dialplan['X!']); |
| 618 | 618 | $rout_data_dial[$login] = $rout_data_dial['X!']; |
| 619 | - }elseif($add_login_pattern === true && $need_def_rout === true && count($data) === 1){ |
|
| 619 | + } elseif($add_login_pattern === true && $need_def_rout === true && count($data) === 1){ |
|
| 620 | 620 | // Только маршрут "По умолчанию". |
| 621 | 621 | $dialplan[$login] = str_replace('_X!,1', "{$login},1", $dialplan['X!']); |
| 622 | 622 | } |
@@ -650,7 +650,7 @@ discard block |
||
| 650 | 650 | // Это конференция. Тут не требуется обработка таймаута ответа. |
| 651 | 651 | // Вызов будет отвечен сразу конференцией. |
| 652 | 652 | $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$default_action->extension},1)); default action" . "\n"; |
| 653 | - }else { |
|
| 653 | + } else { |
|
| 654 | 654 | $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action" . "\n"; |
| 655 | 655 | } |
| 656 | 656 | foreach ($additionalModules as $appClass) { |
@@ -26,14 +26,14 @@ discard block |
||
| 26 | 26 | $additionalModules = $this->di->getShared('pbxConfModules'); |
| 27 | 27 | $conf = "[globals] \n". |
| 28 | 28 | "TRANSFER_CONTEXT=internal-transfer; \n"; |
| 29 | - if($this->generalSettings['PBXRecordCalls'] === '1'){ |
|
| 30 | - $conf.="MONITOR_DIR=".Storage::getMonitorDir()." \n"; |
|
| 31 | - $conf.="MONITOR_STEREO=".$this->generalSettings['PBXSplitAudioThread']." \n"; |
|
| 29 | + if ($this->generalSettings['PBXRecordCalls'] === '1') { |
|
| 30 | + $conf .= "MONITOR_DIR=".Storage::getMonitorDir()." \n"; |
|
| 31 | + $conf .= "MONITOR_STEREO=".$this->generalSettings['PBXSplitAudioThread']." \n"; |
|
| 32 | 32 | } |
| 33 | 33 | foreach ($additionalModules as $appClass) { |
| 34 | 34 | $addition = $appClass->extensionGlobals(); |
| 35 | - if (!empty($addition)){ |
|
| 36 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 35 | + if (!empty($addition)) { |
|
| 36 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 37 | 37 | } |
| 38 | 38 | } |
| 39 | 39 | $conf .= "\n"; |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | // Переключатель по времени. |
| 57 | 57 | $this->generateOutWorkTimes($conf); |
| 58 | 58 | |
| 59 | - Util::fileWriteContent($this->config->path('asterisk.astetcdir') . '/extensions.conf', $conf); |
|
| 59 | + Util::fileWriteContent($this->config->path('asterisk.astetcdir').'/extensions.conf', $conf); |
|
| 60 | 60 | } |
| 61 | 61 | |
| 62 | 62 | /** |
@@ -68,68 +68,68 @@ discard block |
||
| 68 | 68 | { |
| 69 | 69 | $extension = 'X!'; |
| 70 | 70 | // Контекст для AMI originate. Без него отображается не корректный CallerID. |
| 71 | - $conf .= '[sipregistrations]' . "\n\n"; |
|
| 71 | + $conf .= '[sipregistrations]'."\n\n"; |
|
| 72 | 72 | |
| 73 | - $conf .= '[messages]' . "\n" . |
|
| 74 | - 'exten => _' . $extension . ',1,MessageSend(sip:${EXTEN},"${CALLERID(name)}"${MESSAGE(from)})' . "\n\n"; |
|
| 73 | + $conf .= '[messages]'."\n". |
|
| 74 | + 'exten => _'.$extension.',1,MessageSend(sip:${EXTEN},"${CALLERID(name)}"${MESSAGE(from)})'."\n\n"; |
|
| 75 | 75 | |
| 76 | - $conf .= '[internal-originate]' . " \n"; |
|
| 77 | - $conf .= 'exten => _' . $extension . ',1,NoOP(Hint ${HINT} exten ${EXTEN} )' . " \n"; |
|
| 78 | - $conf .= '; Если это originate, то скроем один CDR.' . " \n\t"; |
|
| 79 | - $conf .= 'same => n,ExecIf($["${pt1c_cid}x" != "x"]?Set(CALLERID(num)=${pt1c_cid}))' . " \n\t"; |
|
| 76 | + $conf .= '[internal-originate]'." \n"; |
|
| 77 | + $conf .= 'exten => _'.$extension.',1,NoOP(Hint ${HINT} exten ${EXTEN} )'." \n"; |
|
| 78 | + $conf .= '; Если это originate, то скроем один CDR.'." \n\t"; |
|
| 79 | + $conf .= 'same => n,ExecIf($["${pt1c_cid}x" != "x"]?Set(CALLERID(num)=${pt1c_cid}))'." \n\t"; |
|
| 80 | 80 | |
| 81 | - $conf .= 'same => n,ExecIf($["${CUT(CHANNEL,\;,2)}" == "2"]?Set(__PT1C_SIP_HEADER=${SIPADDHEADER}))' . " \n\t"; |
|
| 82 | - $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Set(ADDITIONAL_PEER=&Local/${peer_mobile}@outgoing/n))' . " \n\t"; |
|
| 81 | + $conf .= 'same => n,ExecIf($["${CUT(CHANNEL,\;,2)}" == "2"]?Set(__PT1C_SIP_HEADER=${SIPADDHEADER}))'." \n\t"; |
|
| 82 | + $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Set(ADDITIONAL_PEER=&Local/${peer_mobile}@outgoing/n))'." \n\t"; |
|
| 83 | 83 | |
| 84 | 84 | // Описываем возможность прыжка в пользовательский sub контекст. |
| 85 | - $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t"; |
|
| 86 | - $conf .= 'same => n,Dial(Local/${EXTEN}@internal-users/n${ADDITIONAL_PEER},60,cTteKkHhb(originate_create_chan,s,1))' . " \n\n"; |
|
| 87 | - |
|
| 88 | - $conf .= '[originate_create_chan]' . " \n"; |
|
| 89 | - $conf .= 'exten => s,1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t"; |
|
| 90 | - $conf .= 'same => n,return' . " \n\n"; |
|
| 91 | - |
|
| 92 | - $conf .= '[dial_create_chan]' . " \n"; |
|
| 93 | - $conf .= 'exten => s,1,Gosub(lua_${ISTRANSFER}dial_create_chan,${EXTEN},1)' . "\n\t"; |
|
| 94 | - $conf .= 'same => n,Set(pt1c_is_dst=1)' . " \n\t"; |
|
| 95 | - $conf .= 'same => n,ExecIf($["${PT1C_SIP_HEADER}x" != "x"]?Set(PJSIP_HEADER(add,${CUT(PT1C_SIP_HEADER,:,1)})=${CUT(PT1C_SIP_HEADER,:,2)}))' . " \n\t"; |
|
| 96 | - $conf .= 'same => n,Set(__PT1C_SIP_HEADER=${UNDEFINED})' . " \n\t"; |
|
| 97 | - $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . " \n\t"; |
|
| 98 | - $conf .= 'same => n,return' . " \n\n"; |
|
| 99 | - |
|
| 100 | - $conf .= '[hangup_handler]' . "\n"; |
|
| 101 | - $conf .= 'exten => s,1,NoOp(--- hangup - ${CHANNEL} ---)' . "\n\t"; |
|
| 102 | - $conf .= 'same => n,Gosub(hangup_chan,${EXTEN},1)' . "\n\t"; |
|
| 103 | - |
|
| 104 | - $conf .= 'same => n,return' . "\n\n"; |
|
| 105 | - |
|
| 106 | - $conf .= '[set_orign_chan]' . "\n"; |
|
| 107 | - $conf .= 'exten => s,1,Wait(0.2)' . "\n\t"; |
|
| 108 | - $conf .= 'same => n,Set(pl=${IF($["${CHANNEL:-1}" == "1"]?2:1)})' . "\n\t"; |
|
| 109 | - $conf .= 'same => n,Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)})' . "\n\t"; |
|
| 110 | - $conf .= 'same => n,ExecIf($[ "${orign_chan}x" == "x" ]?Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},FROM_CHAN)}))' . "\n\t"; |
|
| 111 | - $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN}x" != "x" ]?Set(__QUEUE_SRC_CHAN=${orign_chan}))' . "\n\t"; |
|
| 112 | - $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN:0:5}" == "Local" ]?Set(__QUEUE_SRC_CHAN=${FROM_CHAN}))' . "\n\t"; |
|
| 113 | - $conf .= 'same => n,ExecIf($[ "${FROM_CHAN}x" == "x" ]?Set(__FROM_CHAN=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)}))' . "\n\t"; |
|
| 114 | - $conf .= 'same => n,return' . "\n\n"; |
|
| 115 | - |
|
| 116 | - $conf .= '[playback]' . "\n"; |
|
| 117 | - $conf .= 'exten => s,1,Playback(hello_demo,noanswer)' . "\n\t"; |
|
| 118 | - $conf .= 'same => n,ExecIf($["${SRC_BRIDGE_CHAN}x" == "x"]?Wait(30))' . "\n\t"; |
|
| 119 | - $conf .= 'same => n,Wait(0.3)' . "\n\t"; |
|
| 120 | - $conf .= 'same => n,Bridge(${SRC_BRIDGE_CHAN},kKTthH)' . "\n\n"; |
|
| 121 | - |
|
| 122 | - $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n"; |
|
| 85 | + $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t"; |
|
| 86 | + $conf .= 'same => n,Dial(Local/${EXTEN}@internal-users/n${ADDITIONAL_PEER},60,cTteKkHhb(originate_create_chan,s,1))'." \n\n"; |
|
| 87 | + |
|
| 88 | + $conf .= '[originate_create_chan]'." \n"; |
|
| 89 | + $conf .= 'exten => s,1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t"; |
|
| 90 | + $conf .= 'same => n,return'." \n\n"; |
|
| 91 | + |
|
| 92 | + $conf .= '[dial_create_chan]'." \n"; |
|
| 93 | + $conf .= 'exten => s,1,Gosub(lua_${ISTRANSFER}dial_create_chan,${EXTEN},1)'."\n\t"; |
|
| 94 | + $conf .= 'same => n,Set(pt1c_is_dst=1)'." \n\t"; |
|
| 95 | + $conf .= 'same => n,ExecIf($["${PT1C_SIP_HEADER}x" != "x"]?Set(PJSIP_HEADER(add,${CUT(PT1C_SIP_HEADER,:,1)})=${CUT(PT1C_SIP_HEADER,:,2)}))'." \n\t"; |
|
| 96 | + $conf .= 'same => n,Set(__PT1C_SIP_HEADER=${UNDEFINED})'." \n\t"; |
|
| 97 | + $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'." \n\t"; |
|
| 98 | + $conf .= 'same => n,return'." \n\n"; |
|
| 99 | + |
|
| 100 | + $conf .= '[hangup_handler]'."\n"; |
|
| 101 | + $conf .= 'exten => s,1,NoOp(--- hangup - ${CHANNEL} ---)'."\n\t"; |
|
| 102 | + $conf .= 'same => n,Gosub(hangup_chan,${EXTEN},1)'."\n\t"; |
|
| 103 | + |
|
| 104 | + $conf .= 'same => n,return'."\n\n"; |
|
| 105 | + |
|
| 106 | + $conf .= '[set_orign_chan]'."\n"; |
|
| 107 | + $conf .= 'exten => s,1,Wait(0.2)'."\n\t"; |
|
| 108 | + $conf .= 'same => n,Set(pl=${IF($["${CHANNEL:-1}" == "1"]?2:1)})'."\n\t"; |
|
| 109 | + $conf .= 'same => n,Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)})'."\n\t"; |
|
| 110 | + $conf .= 'same => n,ExecIf($[ "${orign_chan}x" == "x" ]?Set(orign_chan=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},FROM_CHAN)}))'."\n\t"; |
|
| 111 | + $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN}x" != "x" ]?Set(__QUEUE_SRC_CHAN=${orign_chan}))'."\n\t"; |
|
| 112 | + $conf .= 'same => n,ExecIf($[ "${QUEUE_SRC_CHAN:0:5}" == "Local" ]?Set(__QUEUE_SRC_CHAN=${FROM_CHAN}))'."\n\t"; |
|
| 113 | + $conf .= 'same => n,ExecIf($[ "${FROM_CHAN}x" == "x" ]?Set(__FROM_CHAN=${IMPORT(${CUT(CHANNEL,\;,1)}\;${pl},BRIDGEPEER)}))'."\n\t"; |
|
| 114 | + $conf .= 'same => n,return'."\n\n"; |
|
| 115 | + |
|
| 116 | + $conf .= '[playback]'."\n"; |
|
| 117 | + $conf .= 'exten => s,1,Playback(hello_demo,noanswer)'."\n\t"; |
|
| 118 | + $conf .= 'same => n,ExecIf($["${SRC_BRIDGE_CHAN}x" == "x"]?Wait(30))'."\n\t"; |
|
| 119 | + $conf .= 'same => n,Wait(0.3)'."\n\t"; |
|
| 120 | + $conf .= 'same => n,Bridge(${SRC_BRIDGE_CHAN},kKTthH)'."\n\n"; |
|
| 121 | + |
|
| 122 | + $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n"; |
|
| 123 | 123 | |
| 124 | 124 | // TODO / Добавление / удаление префиксов на входящий callerid. |
| 125 | - $conf .= '[add-trim-prefix-clid]' . "\n"; |
|
| 126 | - $conf .= 'exten => _.!,1,NoOp(--- Incoming call from ${CALLERID(num)} ---)' . "\n\t"; |
|
| 127 | - $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t"; |
|
| 125 | + $conf .= '[add-trim-prefix-clid]'."\n"; |
|
| 126 | + $conf .= 'exten => _.!,1,NoOp(--- Incoming call from ${CALLERID(num)} ---)'."\n\t"; |
|
| 127 | + $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t"; |
|
| 128 | 128 | // Отсекаем "+". |
| 129 | 129 | // $conf.= 'same => n,ExecIf( $["${CALLERID(num):0:1}" == "+"]?Set(CALLERID(num)=${CALLERID(num):1}))'."\n\t"; |
| 130 | 130 | // Отсекаем "7" и добавляем "8". |
| 131 | 131 | // $conf.= 'same => n,ExecIf( $["${REGEX("^7[0-9]+" ${CALLERID(num)})}" == "1"]?Set(CALLERID(num)=8${CALLERID(num):1}))'."\n\t"; |
| 132 | - $conf .= 'same => n,return' . "\n\n"; |
|
| 132 | + $conf .= 'same => n,return'."\n\n"; |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
@@ -145,136 +145,136 @@ discard block |
||
| 145 | 145 | $additionalModules = $this->di->getShared('pbxConfModules'); |
| 146 | 146 | foreach ($additionalModules as $appClass) { |
| 147 | 147 | $addition = $appClass->extensionGenContexts(); |
| 148 | - if (!empty($addition)){ |
|
| 149 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 148 | + if (!empty($addition)) { |
|
| 149 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | $conf .= "\n"; |
| 153 | 153 | $conf .= "[internal-num-undefined] \n"; |
| 154 | - $conf .= 'exten => _' . $extension . ',1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t"; |
|
| 155 | - $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . "\n\t"; |
|
| 154 | + $conf .= 'exten => _'.$extension.',1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t"; |
|
| 155 | + $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'."\n\t"; |
|
| 156 | 156 | $conf .= "same => n,Playback(pbx-invalid,noanswer) \n\n"; |
| 157 | 157 | |
| 158 | 158 | $conf .= "[internal-fw]\n"; |
| 159 | - $conf .= 'exten => _' . $extension . ',1,NoOp(DIALSTATUS - ${DIALSTATUS})' . "\n\t"; |
|
| 159 | + $conf .= 'exten => _'.$extension.',1,NoOp(DIALSTATUS - ${DIALSTATUS})'."\n\t"; |
|
| 160 | 160 | // CANCEL - вызов был отменен, к примеру *0, не нужно дальше искать адресат. |
| 161 | - $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CANCEL"]?Hangup())' . "\n\t"; |
|
| 161 | + $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CANCEL"]?Hangup())'."\n\t"; |
|
| 162 | 162 | // BUSY - занято. К примру абонент завершил вызов или DND. |
| 163 | - $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "BUSY"]?Set(dstatus=FW_BUSY))' . "\n\t"; |
|
| 163 | + $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "BUSY"]?Set(dstatus=FW_BUSY))'."\n\t"; |
|
| 164 | 164 | // CHANUNAVAIL - канал не доступен. К примеру телефон не зарегистрирован или не отвечает. |
| 165 | - $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CHANUNAVAIL"]?Set(dstatus=FW_UNAV))' . "\n\t"; |
|
| 165 | + $conf .= 'same => n,ExecIf($["${DIALSTATUS}" == "CHANUNAVAIL"]?Set(dstatus=FW_UNAV))'."\n\t"; |
|
| 166 | 166 | // NOANSWER - не ответили по таймауту. |
| 167 | - $conf .= 'same => n,ExecIf($["${dstatus}x" == "x"]?Set(dstatus=FW))' . "\n\t"; |
|
| 168 | - $conf .= 'same => n,Set(fw=${DB(${dstatus}/${EXTEN})})' . "\n\t"; |
|
| 169 | - $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Set(__pt1c_UNIQUEID=${UNDEFINED})' . "\n\t"; |
|
| 170 | - $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Goto(internal,${fw},1))' . "\n\t"; |
|
| 171 | - $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . "\n\t"; |
|
| 172 | - $conf .= 'same => n,Hangup() ' . "\n\n"; |
|
| 167 | + $conf .= 'same => n,ExecIf($["${dstatus}x" == "x"]?Set(dstatus=FW))'."\n\t"; |
|
| 168 | + $conf .= 'same => n,Set(fw=${DB(${dstatus}/${EXTEN})})'."\n\t"; |
|
| 169 | + $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Set(__pt1c_UNIQUEID=${UNDEFINED})'."\n\t"; |
|
| 170 | + $conf .= 'same => n,ExecIf($["${fw}x" != "x"]?Goto(internal,${fw},1))'."\n\t"; |
|
| 171 | + $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'."\n\t"; |
|
| 172 | + $conf .= 'same => n,Hangup() '."\n\n"; |
|
| 173 | 173 | |
| 174 | 174 | $conf .= "[all_peers]\n"; |
| 175 | - $conf .= 'include => internal-hints' . "\n"; |
|
| 176 | - $conf .= 'exten => failed,1,Hangup()' . "\n"; |
|
| 175 | + $conf .= 'include => internal-hints'."\n"; |
|
| 176 | + $conf .= 'exten => failed,1,Hangup()'."\n"; |
|
| 177 | 177 | |
| 178 | - $conf .= 'exten => _.!,1,ExecIf($[ "${EXTEN}" == "h" ]?Hangup())' . "\n\t"; |
|
| 178 | + $conf .= 'exten => _.!,1,ExecIf($[ "${EXTEN}" == "h" ]?Hangup())'."\n\t"; |
|
| 179 | 179 | // Фильтр спецсимволов. Разершаем только цифры. |
| 180 | - $conf .= 'same => n,Set(cleanNumber=${FILTER(\*\#1234567890,${EXTEN})})' . "\n\t"; |
|
| 181 | - $conf .= 'same => n,ExecIf($["${EXTEN}" != "${cleanNumber}"]?Goto(${CONTEXT},${cleanNumber},$[${PRIORITY} + 1]))' . "\n\t"; |
|
| 180 | + $conf .= 'same => n,Set(cleanNumber=${FILTER(\*\#1234567890,${EXTEN})})'."\n\t"; |
|
| 181 | + $conf .= 'same => n,ExecIf($["${EXTEN}" != "${cleanNumber}"]?Goto(${CONTEXT},${cleanNumber},$[${PRIORITY} + 1]))'."\n\t"; |
|
| 182 | 182 | |
| 183 | - $conf .= 'same => n,Set(__FROM_CHAN=${CHANNEL})' . "\n\t"; |
|
| 184 | - $conf .= 'same => n,ExecIf($["${OLD_LINKEDID}x" == "x"]?Set(__OLD_LINKEDID=${CHANNEL(linkedid)}))' . "\n\t"; |
|
| 185 | - $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))' . "\n\t"; |
|
| 186 | - $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . "\n\t"; |
|
| 183 | + $conf .= 'same => n,Set(__FROM_CHAN=${CHANNEL})'."\n\t"; |
|
| 184 | + $conf .= 'same => n,ExecIf($["${OLD_LINKEDID}x" == "x"]?Set(__OLD_LINKEDID=${CHANNEL(linkedid)}))'."\n\t"; |
|
| 185 | + $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))'."\n\t"; |
|
| 186 | + $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'."\n\t"; |
|
| 187 | 187 | |
| 188 | - $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(num)=${FROM_PEER}))' . "\n\t"; |
|
| 189 | - $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(name)=${FROM_PEER}))' . "\n\t"; |
|
| 188 | + $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(num)=${FROM_PEER}))'."\n\t"; |
|
| 189 | + $conf .= 'same => n,ExecIf($["${CALLERID(num)}x" == "x"]?Set(CALLERID(name)=${FROM_PEER}))'."\n\t"; |
|
| 190 | 190 | |
| 191 | - $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local" && "${FROM_PEER}x" == "x"]?Set(__FROM_PEER=${CALLERID(num)}))' . "\n\t"; |
|
| 192 | - $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t"; |
|
| 193 | - $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t"; |
|
| 191 | + $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local" && "${FROM_PEER}x" == "x"]?Set(__FROM_PEER=${CALLERID(num)}))'."\n\t"; |
|
| 192 | + $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t"; |
|
| 193 | + $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t"; |
|
| 194 | 194 | |
| 195 | 195 | // Описываем возможность прыжка в пользовательский sub контекст. |
| 196 | - $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t"; |
|
| 196 | + $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t"; |
|
| 197 | 197 | |
| 198 | - $conf .= 'same => n,Goto(peer_${FROM_PEER},${EXTEN},1)' . "\n\n"; |
|
| 198 | + $conf .= 'same => n,Goto(peer_${FROM_PEER},${EXTEN},1)'."\n\n"; |
|
| 199 | 199 | |
| 200 | - $pickupexten = $this->generalSettings['PBXFeaturePickupExten']; |
|
| 201 | - $conf .= 'exten => _' . $pickupexten . $extension . ',1,Set(PICKUPEER=' . $technology . '/${FILTER(0-9,${EXTEN:2})})' . "\n\t"; |
|
| 202 | - $conf .= 'same => n,Set(pt1c_dnid=${EXTEN})' . "\n\t"; |
|
| 203 | - $conf .= 'same => n,PickupChan(${PICKUPEER})' . "\n\t"; |
|
| 204 | - $conf .= 'same => n,Hangup()' . "\n\n"; |
|
| 200 | + $pickupexten = $this->generalSettings['PBXFeaturePickupExten']; |
|
| 201 | + $conf .= 'exten => _'.$pickupexten.$extension.',1,Set(PICKUPEER='.$technology.'/${FILTER(0-9,${EXTEN:2})})'."\n\t"; |
|
| 202 | + $conf .= 'same => n,Set(pt1c_dnid=${EXTEN})'."\n\t"; |
|
| 203 | + $conf .= 'same => n,PickupChan(${PICKUPEER})'."\n\t"; |
|
| 204 | + $conf .= 'same => n,Hangup()'."\n\n"; |
|
| 205 | 205 | |
| 206 | 206 | $voicemail_exten = $this->generalSettings['VoicemailExten']; |
| 207 | - $conf .= 'exten => ' . $voicemail_exten . ',1,NoOp(NOTICE, Dialing out from ${CALLERID(all)} to VoiceMail)' . "\n\t"; |
|
| 208 | - $conf .= 'same => n,VoiceMailMain(admin@voicemailcontext,s)' . "\n\t"; |
|
| 209 | - $conf .= 'same => n,Hangup()' . "\n\n"; |
|
| 207 | + $conf .= 'exten => '.$voicemail_exten.',1,NoOp(NOTICE, Dialing out from ${CALLERID(all)} to VoiceMail)'."\n\t"; |
|
| 208 | + $conf .= 'same => n,VoiceMailMain(admin@voicemailcontext,s)'."\n\t"; |
|
| 209 | + $conf .= 'same => n,Hangup()'."\n\n"; |
|
| 210 | 210 | |
| 211 | 211 | $conf .= "[voice_mail_peer] \n"; |
| 212 | - $conf .= 'exten => voicemail,1,Answer()' . "\n\t"; |
|
| 213 | - $conf .= 'same => n,VoiceMail(admin@voicemailcontext)' . "\n\t"; |
|
| 214 | - $conf .= 'same => n,Hangup()' . "\n\n"; |
|
| 212 | + $conf .= 'exten => voicemail,1,Answer()'."\n\t"; |
|
| 213 | + $conf .= 'same => n,VoiceMail(admin@voicemailcontext)'."\n\t"; |
|
| 214 | + $conf .= 'same => n,Hangup()'."\n\n"; |
|
| 215 | 215 | |
| 216 | 216 | // Контекст для внутренних вызовов. |
| 217 | 217 | $conf .= "[internal] \n"; |
| 218 | 218 | |
| 219 | 219 | foreach ($additionalModules as $appClass) { |
| 220 | 220 | $addition = $appClass->getIncludeInternal(); |
| 221 | - if (!empty($addition)){ |
|
| 222 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 221 | + if (!empty($addition)) { |
|
| 222 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 223 | 223 | } |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | foreach ($additionalModules as $appClass) { |
| 227 | 227 | $addition = $appClass->extensionGenInternal(); |
| 228 | - if (!empty($addition)){ |
|
| 229 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 228 | + if (!empty($addition)) { |
|
| 229 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 230 | 230 | } |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - $conf .= 'exten => i,1,NoOp(-- INVALID NUMBER --)' . "\n\t"; |
|
| 234 | - $conf .= 'same => n,Set(DIALSTATUS=INVALID_NUMBER)' . "\n\t"; |
|
| 235 | - $conf .= 'same => n,Playback(privacy-incorrect,noanswer)' . "\n\t"; |
|
| 236 | - $conf .= 'same => n,Hangup()' . "\n"; |
|
| 233 | + $conf .= 'exten => i,1,NoOp(-- INVALID NUMBER --)'."\n\t"; |
|
| 234 | + $conf .= 'same => n,Set(DIALSTATUS=INVALID_NUMBER)'."\n\t"; |
|
| 235 | + $conf .= 'same => n,Playback(privacy-incorrect,noanswer)'."\n\t"; |
|
| 236 | + $conf .= 'same => n,Hangup()'."\n"; |
|
| 237 | 237 | |
| 238 | - $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n"; |
|
| 238 | + $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n"; |
|
| 239 | 239 | |
| 240 | 240 | $conf .= "[internal-incoming]\n"; |
| 241 | - $conf .= 'exten => _.!,1,ExecIf($["${MASTER_CHANNEL(M_TIMEOUT)}x" != "x"]?Set(TIMEOUT(absolute)=${MASTER_CHANNEL(M_TIMEOUT)}))' . " \n\t"; |
|
| 242 | - $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT_CHANNEL)=${CHANNEL})' . " \n\t"; |
|
| 243 | - $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT)=${EMPTY_VAR})' . " \n\t"; |
|
| 244 | - $conf .= 'same => n,Goto(internal,${EXTEN},1)' . " \n\n"; |
|
| 241 | + $conf .= 'exten => _.!,1,ExecIf($["${MASTER_CHANNEL(M_TIMEOUT)}x" != "x"]?Set(TIMEOUT(absolute)=${MASTER_CHANNEL(M_TIMEOUT)}))'." \n\t"; |
|
| 242 | + $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT_CHANNEL)=${CHANNEL})'." \n\t"; |
|
| 243 | + $conf .= 'same => n,Set(MASTER_CHANNEL(M_TIMEOUT)=${EMPTY_VAR})'." \n\t"; |
|
| 244 | + $conf .= 'same => n,Goto(internal,${EXTEN},1)'." \n\n"; |
|
| 245 | 245 | |
| 246 | 246 | $conf .= "[internal-users] \n"; |
| 247 | - $conf .= 'exten => _' . $extension . ',1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . " \n\t"; |
|
| 248 | - $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Set(SIPADDHEADER01=${EMPTY_VAR})' . " \n\t"; |
|
| 249 | - $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))' . " \n\t"; |
|
| 247 | + $conf .= 'exten => _'.$extension.',1,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'." \n\t"; |
|
| 248 | + $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Set(SIPADDHEADER01=${EMPTY_VAR})'." \n\t"; |
|
| 249 | + $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Gosub(set_orign_chan,s,1))'." \n\t"; |
|
| 250 | 250 | |
| 251 | - $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t"; |
|
| 251 | + $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t"; |
|
| 252 | 252 | // Проверим, существует ли такой пир. |
| 253 | 253 | |
| 254 | - $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(internal-num-undefined,${EXTEN},1))' . " \n\t"; |
|
| 255 | - $conf .= 'same => n,ExecIf($["${DEVICE_STATE(' . $technology . '/${EXTEN})}" == "BUSY"]?Set(DIALSTATUS=BUSY))' . " \n\t"; |
|
| 256 | - $conf .= 'same => n,GotoIf($["${DEVICE_STATE(' . $technology . '/${EXTEN})}" == "BUSY"]?fw_start)' . " \n\t"; |
|
| 254 | + $conf .= 'same => n,ExecIf($["${PJSIP_ENDPOINT(${EXTEN},auth)}x" == "x"]?Goto(internal-num-undefined,${EXTEN},1))'." \n\t"; |
|
| 255 | + $conf .= 'same => n,ExecIf($["${DEVICE_STATE('.$technology.'/${EXTEN})}" == "BUSY"]?Set(DIALSTATUS=BUSY))'." \n\t"; |
|
| 256 | + $conf .= 'same => n,GotoIf($["${DEVICE_STATE('.$technology.'/${EXTEN})}" == "BUSY"]?fw_start)'." \n\t"; |
|
| 257 | 257 | |
| 258 | 258 | // Как долго звонить пиру. |
| 259 | - $conf .= 'same => n,Set(ringlength=${DB(FW_TIME/${EXTEN})})' . " \n\t"; |
|
| 260 | - $conf .= 'same => n,ExecIf($["${ringlength}x" == "x"]?Set(ringlength=600))' . " \n\t"; |
|
| 261 | - $conf .= 'same => n,ExecIf($["${QUEUE_SRC_CHAN}x" != "x" && "${ISTRANSFER}x" == "x"]?Set(ringlength=600))' . " \n\t"; |
|
| 259 | + $conf .= 'same => n,Set(ringlength=${DB(FW_TIME/${EXTEN})})'." \n\t"; |
|
| 260 | + $conf .= 'same => n,ExecIf($["${ringlength}x" == "x"]?Set(ringlength=600))'." \n\t"; |
|
| 261 | + $conf .= 'same => n,ExecIf($["${QUEUE_SRC_CHAN}x" != "x" && "${ISTRANSFER}x" == "x"]?Set(ringlength=600))'." \n\t"; |
|
| 262 | 262 | |
| 263 | - $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1) ' . " \n\t"; |
|
| 263 | + $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1) '." \n\t"; |
|
| 264 | 264 | // Совершаем вызов пира. |
| 265 | - $conf .= 'same => n,Set(DST_CONTACT=${PJSIP_DIAL_CONTACTS(${EXTEN})})' . " \n\t"; |
|
| 266 | - $conf .= 'same => n,ExecIf($["${FIELDQTY(DST_CONTACT,&)}" != "1"]?Set(__PT1C_SIP_HEADER=${EMPTY_VAR}))' . " \n\t"; |
|
| 267 | - $conf .= 'same => n,ExecIf($["${DST_CONTACT}x" != "x"]?Dial(${DST_CONTACT},${ringlength},cTtekKHhU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1)):Set(DIALSTATUS=CHANUNAVAIL))' . " \n\t"; |
|
| 268 | - $conf .= 'same => n(fw_start),NoOp(dial_hangup)' . " \n\t"; |
|
| 265 | + $conf .= 'same => n,Set(DST_CONTACT=${PJSIP_DIAL_CONTACTS(${EXTEN})})'." \n\t"; |
|
| 266 | + $conf .= 'same => n,ExecIf($["${FIELDQTY(DST_CONTACT,&)}" != "1"]?Set(__PT1C_SIP_HEADER=${EMPTY_VAR}))'." \n\t"; |
|
| 267 | + $conf .= 'same => n,ExecIf($["${DST_CONTACT}x" != "x"]?Dial(${DST_CONTACT},${ringlength},cTtekKHhU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1)):Set(DIALSTATUS=CHANUNAVAIL))'." \n\t"; |
|
| 268 | + $conf .= 'same => n(fw_start),NoOp(dial_hangup)'." \n\t"; |
|
| 269 | 269 | |
| 270 | 270 | // QUEUE_SRC_CHAN - установлена, если вызов сервершен агенту очереди. |
| 271 | 271 | // Проверяем нужна ли переадресация |
| 272 | - $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${ISTRANSFER}x" != "x"]?Goto(internal-fw,${EXTEN},1))' . " \n\t"; |
|
| 273 | - $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${QUEUE_SRC_CHAN}x" == "x"]?Goto(internal-fw,${EXTEN},1))' . " \n\t"; |
|
| 274 | - $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . " \n\t"; |
|
| 275 | - $conf .= 'same => n,Hangup()' . "\n\n"; |
|
| 272 | + $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${ISTRANSFER}x" != "x"]?Goto(internal-fw,${EXTEN},1))'." \n\t"; |
|
| 273 | + $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${QUEUE_SRC_CHAN}x" == "x"]?Goto(internal-fw,${EXTEN},1))'." \n\t"; |
|
| 274 | + $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'." \n\t"; |
|
| 275 | + $conf .= 'same => n,Hangup()'."\n\n"; |
|
| 276 | 276 | |
| 277 | - $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\n"; |
|
| 277 | + $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\n"; |
|
| 278 | 278 | } |
| 279 | 279 | |
| 280 | 280 | /** |
@@ -285,22 +285,22 @@ discard block |
||
| 285 | 285 | private function generateInternalTransfer(&$conf): void |
| 286 | 286 | { |
| 287 | 287 | $additionalModules = $this->di->getShared('pbxConfModules'); |
| 288 | - $conf .= "[internal-transfer] \n"; |
|
| 288 | + $conf .= "[internal-transfer] \n"; |
|
| 289 | 289 | |
| 290 | 290 | foreach ($additionalModules as $appClass) { |
| 291 | - $addition= $appClass->getIncludeInternalTransfer(); |
|
| 292 | - if (!empty($addition)){ |
|
| 293 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 291 | + $addition = $appClass->getIncludeInternalTransfer(); |
|
| 292 | + if (!empty($addition)) { |
|
| 293 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 294 | 294 | } |
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | foreach ($additionalModules as $appClass) { |
| 298 | - $addition= $appClass->extensionGenInternalTransfer(); |
|
| 299 | - if (!empty($addition)){ |
|
| 300 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 298 | + $addition = $appClass->extensionGenInternalTransfer(); |
|
| 299 | + if (!empty($addition)) { |
|
| 300 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 301 | 301 | } |
| 302 | 302 | } |
| 303 | - $conf .= 'exten => h,1,Gosub(transfer_dial_hangup,${EXTEN},1)' . "\n\n"; |
|
| 303 | + $conf .= 'exten => h,1,Gosub(transfer_dial_hangup,${EXTEN},1)'."\n\n"; |
|
| 304 | 304 | } |
| 305 | 305 | |
| 306 | 306 | /** |
@@ -311,11 +311,11 @@ discard block |
||
| 311 | 311 | private function generateSipHints(&$conf): void |
| 312 | 312 | { |
| 313 | 313 | $additionalModules = $this->di->getShared('pbxConfModules'); |
| 314 | - $conf .= "[internal-hints] \n"; |
|
| 314 | + $conf .= "[internal-hints] \n"; |
|
| 315 | 315 | foreach ($additionalModules as $appClass) { |
| 316 | 316 | $addition = $appClass->extensionGenHints(); |
| 317 | - if (!empty($addition)){ |
|
| 318 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 317 | + if (!empty($addition)) { |
|
| 318 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 319 | 319 | } |
| 320 | 320 | } |
| 321 | 321 | $conf .= "\n\n"; |
@@ -329,16 +329,16 @@ discard block |
||
| 329 | 329 | private function generateOutContextPeers(&$conf): void |
| 330 | 330 | { |
| 331 | 331 | $additionalModules = $this->di->getShared('pbxConfModules'); |
| 332 | - $conf .= "[outgoing] \n"; |
|
| 332 | + $conf .= "[outgoing] \n"; |
|
| 333 | 333 | |
| 334 | - $conf .= 'exten => _+.!,1,NoOp(Strip + sign from number and convert it to +)' . " \n\t"; |
|
| 335 | - $conf .= 'same => n,Set(ADDPLUS=+);' . " \n\t"; |
|
| 336 | - $conf .= 'same => n,Goto(${CONTEXT},${EXTEN:1},1);' . " \n\n"; |
|
| 337 | - $conf .= 'exten => _X!,1,NoOp(Start outgoing calling...)' . " \n\t"; |
|
| 338 | - $conf .= 'same => n,Ringing()' . " \n\t"; |
|
| 334 | + $conf .= 'exten => _+.!,1,NoOp(Strip + sign from number and convert it to +)'." \n\t"; |
|
| 335 | + $conf .= 'same => n,Set(ADDPLUS=+);'." \n\t"; |
|
| 336 | + $conf .= 'same => n,Goto(${CONTEXT},${EXTEN:1},1);'." \n\n"; |
|
| 337 | + $conf .= 'exten => _X!,1,NoOp(Start outgoing calling...)'." \n\t"; |
|
| 338 | + $conf .= 'same => n,Ringing()'." \n\t"; |
|
| 339 | 339 | |
| 340 | 340 | // Описываем возможность прыжка в пользовательский sub контекст. |
| 341 | - $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)' . "\n\t"; |
|
| 341 | + $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'."\n\t"; |
|
| 342 | 342 | |
| 343 | 343 | /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $routs */ |
| 344 | 344 | /** @var \MikoPBX\Common\Models\OutgoingRoutingTable $rout */ |
@@ -350,66 +350,66 @@ discard block |
||
| 350 | 350 | if ($technology !== '') { |
| 351 | 351 | $rout_data = $rout->toArray(); |
| 352 | 352 | $rout_data['technology'] = $technology; |
| 353 | - $id_dialplan = $rout_data['providerid'] . '-' . $rout_data['id'] . '-outgoing'; |
|
| 353 | + $id_dialplan = $rout_data['providerid'].'-'.$rout_data['id'].'-outgoing'; |
|
| 354 | 354 | $provider_contexts[$id_dialplan] = $rout_data; |
| 355 | - $conf .= $this->generateOutgoingRegexPattern($rout_data); |
|
| 355 | + $conf .= $this->generateOutgoingRegexPattern($rout_data); |
|
| 356 | 356 | continue; |
| 357 | 357 | } |
| 358 | 358 | } |
| 359 | - $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Hangup())' . " \n\t"; |
|
| 360 | - $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${BLINDTRANSFER}x" != "x" && "${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t"; |
|
| 361 | - $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))' . " \n\t"; |
|
| 362 | - $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" == "x"]?Gosub(dial,${EXTEN},1))' . "\n\t"; |
|
| 359 | + $conf .= 'same => n,ExecIf($["${peer_mobile}x" != "x"]?Hangup())'." \n\t"; |
|
| 360 | + $conf .= 'same => n,ExecIf($["${DIALSTATUS}" != "ANSWER" && "${BLINDTRANSFER}x" != "x" && "${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t"; |
|
| 361 | + $conf .= 'same => n,ExecIf($["${BLINDTRANSFER}x" != "x"]?AGI(check_redirect.php,${BLINDTRANSFER}))'." \n\t"; |
|
| 362 | + $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" == "x"]?Gosub(dial,${EXTEN},1))'."\n\t"; |
|
| 363 | 363 | |
| 364 | - $conf .= 'same => n,Playback(silence/2,noanswer)' . " \n\t"; |
|
| 365 | - $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" != "x"]?Playback(followme/sorry,noanswer):Playback(cannot-complete-as-dialed,noanswer))' . " \n\t"; |
|
| 366 | - $conf .= 'same => n,Hangup()' . " \n\n"; |
|
| 367 | - $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t"; |
|
| 364 | + $conf .= 'same => n,Playback(silence/2,noanswer)'." \n\t"; |
|
| 365 | + $conf .= 'same => n,ExecIf($["${ROUTFOUND}x" != "x"]?Playback(followme/sorry,noanswer):Playback(cannot-complete-as-dialed,noanswer))'." \n\t"; |
|
| 366 | + $conf .= 'same => n,Hangup()'." \n\n"; |
|
| 367 | + $conf .= 'exten => h,1,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t"; |
|
| 368 | 368 | |
| 369 | 369 | foreach ($provider_contexts as $id_dialplan => $rout) { |
| 370 | 370 | $conf .= "\n[{$id_dialplan}]\n"; |
| 371 | 371 | if (isset($rout['trimfrombegin']) && $rout['trimfrombegin'] > 0) { |
| 372 | 372 | // $exten_var = '${ADDPLUS}${EXTEN:'.$rout['trimfrombegin'].'}'; |
| 373 | - $exten_var = '${EXTEN:' . $rout['trimfrombegin'] . '}'; |
|
| 374 | - $change_exten = 'same => n,ExecIf($["${EXTEN}" != "${number}"]?Goto(${CONTEXT},${number},$[${PRIORITY} + 1]))' . "\n\t"; |
|
| 373 | + $exten_var = '${EXTEN:'.$rout['trimfrombegin'].'}'; |
|
| 374 | + $change_exten = 'same => n,ExecIf($["${EXTEN}" != "${number}"]?Goto(${CONTEXT},${number},$[${PRIORITY} + 1]))'."\n\t"; |
|
| 375 | 375 | } else { |
| 376 | 376 | $exten_var = '${ADDPLUS}${EXTEN}'; |
| 377 | 377 | $change_exten = ''; |
| 378 | 378 | } |
| 379 | - $conf .= 'exten => _X!,1,Set(number=' . $rout['prepend'] . $exten_var . ')' . "\n\t"; |
|
| 379 | + $conf .= 'exten => _X!,1,Set(number='.$rout['prepend'].$exten_var.')'."\n\t"; |
|
| 380 | 380 | $conf .= $change_exten; |
| 381 | 381 | foreach ($additionalModules as $appClass) { |
| 382 | 382 | $addition = $appClass->generateOutRoutContext($rout); |
| 383 | - if (!empty($addition)){ |
|
| 384 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 383 | + if (!empty($addition)) { |
|
| 384 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 385 | 385 | } |
| 386 | 386 | } |
| 387 | - $conf .= 'same => n,ExecIf($["${number}x" == "x"]?Hangup())' . "\n\t"; |
|
| 388 | - $conf .= 'same => n,Set(ROUTFOUND=1)' . "\n\t"; |
|
| 389 | - $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)' . "\n\t"; |
|
| 387 | + $conf .= 'same => n,ExecIf($["${number}x" == "x"]?Hangup())'."\n\t"; |
|
| 388 | + $conf .= 'same => n,Set(ROUTFOUND=1)'."\n\t"; |
|
| 389 | + $conf .= 'same => n,Gosub(${ISTRANSFER}dial,${EXTEN},1)'."\n\t"; |
|
| 390 | 390 | |
| 391 | - $conf .= 'same => n,ExecIf($["${EXTERNALPHONE}" == "${EXTEN}"]?Set(DOPTIONS=tk))' . "\n\t"; |
|
| 391 | + $conf .= 'same => n,ExecIf($["${EXTERNALPHONE}" == "${EXTEN}"]?Set(DOPTIONS=tk))'."\n\t"; |
|
| 392 | 392 | |
| 393 | 393 | // Описываем возможность прыжка в пользовательский sub контекст. |
| 394 | - $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS(' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)}" == "1"]?' . $rout['providerid'] . '-outgoing-custom,${EXTEN},1)' . "\n\t"; |
|
| 394 | + $conf .= 'same => n,GosubIf($["${DIALPLAN_EXISTS('.$rout['providerid'].'-outgoing-custom,${EXTEN},1)}" == "1"]?'.$rout['providerid'].'-outgoing-custom,${EXTEN},1)'."\n\t"; |
|
| 395 | 395 | |
| 396 | 396 | if ($rout['technology'] === IAXConf::TYPE_IAX2) { |
| 397 | - $conf .= 'same => n,Dial(' . $rout['technology'] . '/' . $rout['providerid'] . '/${number},600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))' . "\n\t"; |
|
| 397 | + $conf .= 'same => n,Dial('.$rout['technology'].'/'.$rout['providerid'].'/${number},600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))'."\n\t"; |
|
| 398 | 398 | } else { |
| 399 | - $conf .= 'same => n,Dial(' . $rout['technology'] . '/${number}@' . $rout['providerid'] . ',600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))' . "\n\t"; |
|
| 399 | + $conf .= 'same => n,Dial('.$rout['technology'].'/${number}@'.$rout['providerid'].',600,${DOPTIONS}TKU(${ISTRANSFER}dial_answer)b(dial_create_chan,s,1))'."\n\t"; |
|
| 400 | 400 | } |
| 401 | 401 | foreach ($additionalModules as $appClass) { |
| 402 | 402 | $addition = $appClass->generateOutRoutAfterDialContext($rout); |
| 403 | - if (!empty($addition)){ |
|
| 404 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 403 | + if (!empty($addition)) { |
|
| 404 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 405 | 405 | } |
| 406 | 406 | } |
| 407 | - $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"; |
|
| 407 | + $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"; |
|
| 408 | 408 | |
| 409 | - $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))' . "\n\t"; |
|
| 410 | - $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "ANSWER"]?Hangup())' . "\n\t"; |
|
| 411 | - $conf .= 'same => n,Set(pt1c_UNIQUEID=${EMPTY_VALUE})' . "\n\t"; |
|
| 412 | - $conf .= 'same => n,return' . "\n"; |
|
| 409 | + $conf .= 'same => n,ExecIf($["${ISTRANSFER}x" != "x"]?Gosub(${ISTRANSFER}dial_hangup,${EXTEN},1))'."\n\t"; |
|
| 410 | + $conf .= 'same => n,ExecIf($["${DIALSTATUS}" = "ANSWER"]?Hangup())'."\n\t"; |
|
| 411 | + $conf .= 'same => n,Set(pt1c_UNIQUEID=${EMPTY_VALUE})'."\n\t"; |
|
| 412 | + $conf .= 'same => n,return'."\n"; |
|
| 413 | 413 | } |
| 414 | 414 | } |
| 415 | 415 | |
@@ -425,14 +425,14 @@ discard block |
||
| 425 | 425 | $conf = ''; |
| 426 | 426 | $restnumbers = ''; |
| 427 | 427 | if (isset($rout['restnumbers']) && $rout['restnumbers'] > 0) { |
| 428 | - $restnumbers = "[0-9]{" . $rout['restnumbers'] . "}$"; |
|
| 428 | + $restnumbers = "[0-9]{".$rout['restnumbers']."}$"; |
|
| 429 | 429 | } elseif ($rout['restnumbers'] == 0) { |
| 430 | 430 | $restnumbers = "$"; |
| 431 | 431 | } elseif ($rout['restnumbers'] == -1) { |
| 432 | 432 | $restnumbers = ""; |
| 433 | 433 | } |
| 434 | 434 | $numberbeginswith = $rout['numberbeginswith']; |
| 435 | - $conf .= 'same => n,ExecIf($["${REGEX("^' . $numberbeginswith . $restnumbers . '" ${EXTEN})}" == "1"]?Gosub(' . $rout['providerid'] . '-' . $rout['id'] . '-outgoing,${EXTEN},1))' . " \n\t"; |
|
| 435 | + $conf .= 'same => n,ExecIf($["${REGEX("^'.$numberbeginswith.$restnumbers.'" ${EXTEN})}" == "1"]?Gosub('.$rout['providerid'].'-'.$rout['id'].'-outgoing,${EXTEN},1))'." \n\t"; |
|
| 436 | 436 | |
| 437 | 437 | return $conf; |
| 438 | 438 | } |
@@ -449,7 +449,7 @@ discard block |
||
| 449 | 449 | $conf .= self::generateIncomingContextPeers('none', '', ''); |
| 450 | 450 | $conf .= "[public-direct-dial] \n"; |
| 451 | 451 | foreach ($additionalModules as $appClass) { |
| 452 | - if ($appClass instanceof $this){ |
|
| 452 | + if ($appClass instanceof $this) { |
|
| 453 | 453 | continue; |
| 454 | 454 | } |
| 455 | 455 | $appClass->generatePublicContext($conf); |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | $conf = ''; |
| 480 | 480 | $dialplan = []; |
| 481 | 481 | $di = Di::getDefault(); |
| 482 | - if ($di===null){ |
|
| 482 | + if ($di === null) { |
|
| 483 | 483 | return ''; |
| 484 | 484 | } |
| 485 | 485 | $additionalModules = $di->getShared('pbxConfModules'); |
@@ -535,55 +535,55 @@ discard block |
||
| 535 | 535 | if (empty($rout_data)) { |
| 536 | 536 | $ext_prefix = ('none' === $provider) ? '' : '_'; |
| 537 | 537 | $rout_data .= "exten => {$ext_prefix}{$rout_number},1,NoOp(--- Incoming call ---)\n\t"; |
| 538 | - $rout_data .= 'same => n,Set(CHANNEL(language)=' . $lang . ')' . "\n\t"; |
|
| 539 | - $rout_data .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)' . "\n\t"; |
|
| 540 | - $rout_data .= 'same => n,Set(__FROM_DID=${EXTEN})' . "\n\t"; |
|
| 541 | - $rout_data .= 'same => n,Set(__FROM_CHAN=${CHANNEL})' . "\n\t"; |
|
| 538 | + $rout_data .= 'same => n,Set(CHANNEL(language)='.$lang.')'."\n\t"; |
|
| 539 | + $rout_data .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler,s,1)'."\n\t"; |
|
| 540 | + $rout_data .= 'same => n,Set(__FROM_DID=${EXTEN})'."\n\t"; |
|
| 541 | + $rout_data .= 'same => n,Set(__FROM_CHAN=${CHANNEL})'."\n\t"; |
|
| 542 | 542 | |
| 543 | 543 | // Установка имени пира. |
| 544 | - $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))' . "\n\t"; |
|
| 545 | - $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Set(__FROM_PEER=${CALLERID(num)}))' . "\n\t"; |
|
| 544 | + $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" != "Local"]?Gosub(set_from_peer,s,1))'."\n\t"; |
|
| 545 | + $rout_data .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Set(__FROM_PEER=${CALLERID(num)}))'."\n\t"; |
|
| 546 | 546 | |
| 547 | 547 | // TODO / Подмена входящего callerid. |
| 548 | - $rout_data .= 'same => n,Gosub(add-trim-prefix-clid,${EXTEN},1)' . "\n\t"; |
|
| 548 | + $rout_data .= 'same => n,Gosub(add-trim-prefix-clid,${EXTEN},1)'."\n\t"; |
|
| 549 | 549 | |
| 550 | 550 | foreach ($additionalModules as $appClass) { |
| 551 | 551 | $addition = $appClass->generateIncomingRoutBeforeDial($rout_number); |
| 552 | - if (!empty($addition)){ |
|
| 553 | - $rout_data .=$appClass->confBlockWithComments($addition); |
|
| 552 | + if (!empty($addition)) { |
|
| 553 | + $rout_data .= $appClass->confBlockWithComments($addition); |
|
| 554 | 554 | } |
| 555 | 555 | } |
| 556 | 556 | |
| 557 | 557 | // Перехват на ответственного. |
| 558 | - $rout_data .= 'same => n,UserEvent(Interception,CALLERID: ${CALLERID(num)},chan1c: ${CHANNEL},FROM_DID: ${FROM_DID})' . "\n\t"; |
|
| 558 | + $rout_data .= 'same => n,UserEvent(Interception,CALLERID: ${CALLERID(num)},chan1c: ${CHANNEL},FROM_DID: ${FROM_DID})'."\n\t"; |
|
| 559 | 559 | // Проверим распискние для входящих внешних звонков. |
| 560 | 560 | $rout_data .= 'same => n,Gosub(check-out-work-time,${EXTEN},1)'; |
| 561 | 561 | // Описываем возможность прыжка в пользовательский sub контекст. |
| 562 | - $rout_data .= " \n\t" . 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'; |
|
| 562 | + $rout_data .= " \n\t".'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-custom,${EXTEN},1)'; |
|
| 563 | 563 | } |
| 564 | 564 | |
| 565 | - if ( ! empty($rout['extension'])) { |
|
| 565 | + if (!empty($rout['extension'])) { |
|
| 566 | 566 | $rout_data = rtrim($rout_data); |
| 567 | 567 | // Обязательно проверяем "DIALSTATUS", в случае с парковой через AMI вызова это необходимо. |
| 568 | 568 | // При ответе может отработать следующий приоритет. |
| 569 | - if ( ! isset($rout_data_dial[$rout_number])) { |
|
| 569 | + if (!isset($rout_data_dial[$rout_number])) { |
|
| 570 | 570 | $rout_data_dial[$rout_number] = ''; |
| 571 | 571 | } |
| 572 | 572 | |
| 573 | - if(in_array($rout['extension'], $confExtensions, true)){ |
|
| 573 | + if (in_array($rout['extension'], $confExtensions, true)) { |
|
| 574 | 574 | // Это конференция. Тут не требуется обработка таймаута ответа. |
| 575 | 575 | // Вызов будет отвечен сразу конференцией. |
| 576 | - $dial_command = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$rout['extension']},1));"; |
|
| 576 | + $dial_command = " \n\t".'same => n,'.'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Goto(internal,{$rout['extension']},1));"; |
|
| 577 | 577 | $rout_data_dial[$rout_number] .= ""; |
| 578 | - }else{ |
|
| 579 | - $dial_command = " \n\t" . 'same => n,' . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));"; |
|
| 580 | - $rout_data_dial[$rout_number] .= " \n\t" . "same => n,Set(M_TIMEOUT={$timeout})"; |
|
| 578 | + } else { |
|
| 579 | + $dial_command = " \n\t".'same => n,'.'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Dial(Local/{$rout['extension']}@internal-incoming/n,{$timeout},cTKg));"; |
|
| 580 | + $rout_data_dial[$rout_number] .= " \n\t"."same => n,Set(M_TIMEOUT={$timeout})"; |
|
| 581 | 581 | } |
| 582 | 582 | $rout_data_dial[$rout_number] .= $dial_command; |
| 583 | 583 | |
| 584 | 584 | if (is_array($provider)) { |
| 585 | 585 | $key = $provider[$rout['provider']] ?? ''; |
| 586 | - if ( ! isset($rout_data_dial[$key])) { |
|
| 586 | + if (!isset($rout_data_dial[$key])) { |
|
| 587 | 587 | $rout_data_dial[$key] = ''; |
| 588 | 588 | } |
| 589 | 589 | if (empty($number)) { |
@@ -594,9 +594,9 @@ discard block |
||
| 594 | 594 | } |
| 595 | 595 | |
| 596 | 596 | if (is_string($login)) { |
| 597 | - $add_login_pattern = ! empty($login); |
|
| 597 | + $add_login_pattern = !empty($login); |
|
| 598 | 598 | foreach ($data as $rout) { |
| 599 | - if ( ! $add_login_pattern) { |
|
| 599 | + if (!$add_login_pattern) { |
|
| 600 | 600 | break; |
| 601 | 601 | } // Логин не заполнен, обработка не требуется. |
| 602 | 602 | $is_num = preg_match_all('/^\d+$/m', $login, $matches, PREG_SET_ORDER, 0); |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | if ($add_login_pattern && array_key_exists('X!', $rout_data_dial) && isset($dialplan['X!'])) { |
| 617 | 617 | $dialplan[$login] = str_replace('_X!,1', "{$login},1", $dialplan['X!']); |
| 618 | 618 | $rout_data_dial[$login] = $rout_data_dial['X!']; |
| 619 | - }elseif($add_login_pattern === true && $need_def_rout === true && count($data) === 1){ |
|
| 619 | + }elseif ($add_login_pattern === true && $need_def_rout === true && count($data) === 1) { |
|
| 620 | 620 | // Только маршрут "По умолчанию". |
| 621 | 621 | $dialplan[$login] = str_replace('_X!,1', "{$login},1", $dialplan['X!']); |
| 622 | 622 | } |
@@ -627,7 +627,7 @@ discard block |
||
| 627 | 627 | } |
| 628 | 628 | |
| 629 | 629 | foreach ($dialplan as $key => &$dpln) { |
| 630 | - if ( ! array_key_exists($key, $rout_data_dial)) { |
|
| 630 | + if (!array_key_exists($key, $rout_data_dial)) { |
|
| 631 | 631 | continue; |
| 632 | 632 | } |
| 633 | 633 | $dpln = rtrim($dpln); |
@@ -636,34 +636,34 @@ discard block |
||
| 636 | 636 | unset($dpln); |
| 637 | 637 | |
| 638 | 638 | $uniqid = is_string($provider) ? $provider : $uniqid; |
| 639 | - $conf .= "\n" . "[{$uniqid}-incoming]\n"; |
|
| 639 | + $conf .= "\n"."[{$uniqid}-incoming]\n"; |
|
| 640 | 640 | foreach ($dialplan as $dpln) { |
| 641 | - $conf .= $dpln . "\n"; |
|
| 641 | + $conf .= $dpln."\n"; |
|
| 642 | 642 | if (null === $default_action && 'none' !== $provider) { |
| 643 | 643 | continue; |
| 644 | 644 | } |
| 645 | 645 | if ('extension' === $default_action->action) { |
| 646 | 646 | // Обязательно проверяем "DIALSTATUS", в случае с парковой через AMI вызова это необходимо. |
| 647 | 647 | // При ответе может отработать следующий приоритет. |
| 648 | - $conf .= "\t" . 'same => n,Set(M_TIMEOUT=0)' . "\n"; |
|
| 649 | - if(in_array($default_action->extension, $confExtensions, true)){ |
|
| 648 | + $conf .= "\t".'same => n,Set(M_TIMEOUT=0)'."\n"; |
|
| 649 | + if (in_array($default_action->extension, $confExtensions, true)) { |
|
| 650 | 650 | // Это конференция. Тут не требуется обработка таймаута ответа. |
| 651 | 651 | // Вызов будет отвечен сразу конференцией. |
| 652 | - $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Goto(internal,{$default_action->extension},1)); default action" . "\n"; |
|
| 653 | - }else { |
|
| 654 | - $conf .= "\t" . "same => n," . 'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?' . "Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action" . "\n"; |
|
| 652 | + $conf .= "\t"."same => n,".'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Goto(internal,{$default_action->extension},1)); default action"."\n"; |
|
| 653 | + } else { |
|
| 654 | + $conf .= "\t"."same => n,".'ExecIf($["${M_DIALSTATUS}" != "ANSWER"]?'."Dial(Local/{$default_action->extension}@internal/n,,cTKg)); default action"."\n"; |
|
| 655 | 655 | } |
| 656 | 656 | foreach ($additionalModules as $appClass) { |
| 657 | 657 | $addition = $appClass->generateIncomingRoutAfterDialContext($uniqid); |
| 658 | - if (!empty($addition)){ |
|
| 659 | - $conf .=$appClass->confBlockWithComments($addition); |
|
| 658 | + if (!empty($addition)) { |
|
| 659 | + $conf .= $appClass->confBlockWithComments($addition); |
|
| 660 | 660 | } |
| 661 | 661 | } |
| 662 | - $conf .= " \t" . 'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-after-dial-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-after-dial-custom,${EXTEN},1)' . "\n"; |
|
| 662 | + $conf .= " \t".'same => n,GosubIf($["${DIALPLAN_EXISTS(${CONTEXT}-after-dial-custom,${EXTEN},1)}" == "1"]?${CONTEXT}-after-dial-custom,${EXTEN},1)'."\n"; |
|
| 663 | 663 | } elseif ('busy' === $default_action->action) { |
| 664 | - $conf .= "\t" . "same => n,Busy()" . "\n"; |
|
| 664 | + $conf .= "\t"."same => n,Busy()"."\n"; |
|
| 665 | 665 | } |
| 666 | - $conf .= "\t" . "same => n,Hangup()" . "\n"; |
|
| 666 | + $conf .= "\t"."same => n,Hangup()"."\n"; |
|
| 667 | 667 | } |
| 668 | 668 | |
| 669 | 669 | return $conf; |
@@ -679,10 +679,10 @@ discard block |
||
| 679 | 679 | private function generateOutWorkTimes(&$conf): string |
| 680 | 680 | { |
| 681 | 681 | $conf .= "\n\n[playback-exit]\n"; |
| 682 | - $conf .= 'exten => _.!,1,NoOp(check time)' . "\n\t"; |
|
| 683 | - $conf .= 'same => n,Gosub(dial_outworktimes,${EXTEN},1)' . "\n\t"; |
|
| 684 | - $conf .= 'same => n,Playback(${filename})' . "\n\t"; |
|
| 685 | - $conf .= 'same => n,Hangup()' . "\n\n"; |
|
| 682 | + $conf .= 'exten => _.!,1,NoOp(check time)'."\n\t"; |
|
| 683 | + $conf .= 'same => n,Gosub(dial_outworktimes,${EXTEN},1)'."\n\t"; |
|
| 684 | + $conf .= 'same => n,Playback(${filename})'."\n\t"; |
|
| 685 | + $conf .= 'same => n,Hangup()'."\n\n"; |
|
| 686 | 686 | |
| 687 | 687 | $conf .= "[check-out-work-time]\n"; |
| 688 | 688 | $conf .= "exten => _.!,1,NoOp(check time)\n\t"; |
@@ -694,9 +694,9 @@ discard block |
||
| 694 | 694 | $now_year = 1 * date('Y', time()); |
| 695 | 695 | foreach ($data as $out_data) { |
| 696 | 696 | /** @var \MikoPBX\Common\Models\OutWorkTimes $out_data */ |
| 697 | - if ( ! empty($out_data->date_from) && ! empty($out_data->date_to)) { |
|
| 698 | - $year_from = 1 * date('Y', (int)$out_data->date_from); |
|
| 699 | - $year_to = 1 * date('Y', (int)$out_data->date_to); |
|
| 697 | + if (!empty($out_data->date_from) && !empty($out_data->date_to)) { |
|
| 698 | + $year_from = 1 * date('Y', (int) $out_data->date_from); |
|
| 699 | + $year_to = 1 * date('Y', (int) $out_data->date_to); |
|
| 700 | 700 | if ($now_year < $year_from || $now_year > $year_to) { |
| 701 | 701 | // Правило не актуально для текущего года. |
| 702 | 702 | continue; |
@@ -733,11 +733,11 @@ discard block |
||
| 733 | 733 | $mdays = '*'; |
| 734 | 734 | $months = '*'; |
| 735 | 735 | } else { |
| 736 | - $mdays = strtolower(date("j", (int)$date_from)); |
|
| 737 | - $months = strtolower(date("M", (int)$date_from)); |
|
| 738 | - if ( ! empty($date_to)) { |
|
| 739 | - $mdays .= "-" . strtolower(date("j", (int)$date_to)); |
|
| 740 | - $months .= "-" . strtolower(date("M", (int)$date_to)); |
|
| 736 | + $mdays = strtolower(date("j", (int) $date_from)); |
|
| 737 | + $months = strtolower(date("M", (int) $date_from)); |
|
| 738 | + if (!empty($date_to)) { |
|
| 739 | + $mdays .= "-".strtolower(date("j", (int) $date_to)); |
|
| 740 | + $months .= "-".strtolower(date("M", (int) $date_to)); |
|
| 741 | 741 | } |
| 742 | 742 | } |
| 743 | 743 | |
@@ -750,12 +750,12 @@ discard block |
||
| 750 | 750 | $res = SoundFiles::findFirst($out_data->audio_message_id); |
| 751 | 751 | $audio_message = ($res === null) ? '' : Util::trimExtensionForFile($res->path); |
| 752 | 752 | |
| 753 | - $conf_out_set_var .= "[work-time-set-var-{$out_data->id}]\n" . |
|
| 754 | - 'exten => _.!,1,Set(filename=' . $audio_message . ')' . "\n\t" . |
|
| 755 | - 'same => n,Goto(playback-exit,${EXTEN},1)' . "\n\n"; |
|
| 753 | + $conf_out_set_var .= "[work-time-set-var-{$out_data->id}]\n". |
|
| 754 | + 'exten => _.!,1,Set(filename='.$audio_message.')'."\n\t". |
|
| 755 | + 'same => n,Goto(playback-exit,${EXTEN},1)'."\n\n"; |
|
| 756 | 756 | |
| 757 | 757 | $appname = 'ExecIfTime'; |
| 758 | - $appdata = 'Goto(work-time-set-var-' . $out_data->id . ',${EXTEN},1)'; |
|
| 758 | + $appdata = 'Goto(work-time-set-var-'.$out_data->id.',${EXTEN},1)'; |
|
| 759 | 759 | } |
| 760 | 760 | $conf .= "same => n,{$appname}($times,$weekdays,$mdays,$months?{$appdata})\n\t"; |
| 761 | 761 | } |
@@ -781,10 +781,10 @@ discard block |
||
| 781 | 781 | if ($provider !== null) { |
| 782 | 782 | if ($provider->type === 'SIP') { |
| 783 | 783 | $account = Sip::findFirst('disabled="0" AND uniqid = "'.$uniqueID.'"'); |
| 784 | - $technology = ($account === null)?'':SIPConf::getTechnology(); |
|
| 784 | + $technology = ($account === null) ? '' : SIPConf::getTechnology(); |
|
| 785 | 785 | } elseif ($provider->type === 'IAX') { |
| 786 | 786 | $account = Iax::findFirst('disabled="0" AND uniqid = "'.$uniqueID.'"'); |
| 787 | - $technology = ($account === null)?'':'IAX2'; |
|
| 787 | + $technology = ($account === null) ? '' : 'IAX2'; |
|
| 788 | 788 | } |
| 789 | 789 | } |
| 790 | 790 | |
@@ -25,7 +25,7 @@ |
||
| 25 | 25 | if ($extension) { |
| 26 | 26 | $result = false; |
| 27 | 27 | } |
| 28 | - $this->view->emailAvailable=$result; |
|
| 28 | + $this->view->emailAvailable = $result; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | } |
| 32 | 32 | \ No newline at end of file |
@@ -13,7 +13,8 @@ |
||
| 13 | 13 | |
| 14 | 14 | |
| 15 | 15 | |
| 16 | -class UsersController extends BaseController { |
|
| 16 | +class UsersController extends BaseController |
|
| 17 | +{ |
|
| 17 | 18 | |
| 18 | 19 | /** |
| 19 | 20 | * Проверка на доступность емейл адреса |
@@ -73,7 +73,7 @@ |
||
| 73 | 73 | $variable = str_replace(':', '', $variable); |
| 74 | 74 | $statement = str_replace(":$variable", "'$value'", $statement); |
| 75 | 75 | $statement = preg_replace('/= \?/', " = '{$value}'", $statement, 1); |
| 76 | - // $statement = preg_replace('/\?/', " = '{$value}'", $statement, 1); |
|
| 76 | + // $statement = preg_replace('/\?/', " = '{$value}'", $statement, 1); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | $logger->debug($statement); |
@@ -41,11 +41,11 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | $di->setShared( |
| 43 | 43 | $serviceName, |
| 44 | - function () use ($dbConfig) { |
|
| 45 | - $dbclass = 'Phalcon\Db\Adapter\Pdo\\' . $dbConfig['adapter']; |
|
| 44 | + function() use ($dbConfig) { |
|
| 45 | + $dbclass = 'Phalcon\Db\Adapter\Pdo\\'.$dbConfig['adapter']; |
|
| 46 | 46 | |
| 47 | 47 | $folderWithDB = dirname($dbConfig['dbfile']); |
| 48 | - if (!is_dir($folderWithDB)){ |
|
| 48 | + if (!is_dir($folderWithDB)) { |
|
| 49 | 49 | Util::mwMkdir($folderWithDB, true); |
| 50 | 50 | } |
| 51 | 51 | |
@@ -67,14 +67,14 @@ discard block |
||
| 67 | 67 | // Слушаем все события базы данных |
| 68 | 68 | $eventsManager->attach( |
| 69 | 69 | 'db', |
| 70 | - function ($event, $connection) use ($logger) { |
|
| 70 | + function($event, $connection) use ($logger) { |
|
| 71 | 71 | if ($event->getType() === 'beforeQuery') { |
| 72 | 72 | $statement = $connection->getSQLStatement(); |
| 73 | 73 | $variables = $connection->getSqlVariables(); |
| 74 | 74 | if (is_array($variables)) { |
| 75 | 75 | foreach ($variables as $variable => $value) { |
| 76 | 76 | if (is_array($value)) { |
| 77 | - $value = '(' . implode(', ', $value) . ')'; |
|
| 77 | + $value = '('.implode(', ', $value).')'; |
|
| 78 | 78 | } |
| 79 | 79 | $variable = str_replace(':', '', $variable); |
| 80 | 80 | $statement = str_replace(":$variable", "'$value'", $statement); |
@@ -41,7 +41,8 @@ discard block |
||
| 41 | 41 | { |
| 42 | 42 | $di->setShared( |
| 43 | 43 | $serviceName, |
| 44 | - function () use ($dbConfig) { |
|
| 44 | + function () use ($dbConfig) |
|
| 45 | + { |
|
| 45 | 46 | $dbclass = 'Phalcon\Db\Adapter\Pdo\\' . $dbConfig['adapter']; |
| 46 | 47 | |
| 47 | 48 | $folderWithDB = dirname($dbConfig['dbfile']); |
@@ -67,7 +68,8 @@ discard block |
||
| 67 | 68 | // Слушаем все события базы данных |
| 68 | 69 | $eventsManager->attach( |
| 69 | 70 | 'db', |
| 70 | - function ($event, $connection) use ($logger) { |
|
| 71 | + function ($event, $connection) use ($logger) |
|
| 72 | + { |
|
| 71 | 73 | if ($event->getType() === 'beforeQuery') { |
| 72 | 74 | $statement = $connection->getSQLStatement(); |
| 73 | 75 | $variables = $connection->getSqlVariables(); |
@@ -194,7 +194,7 @@ |
||
| 194 | 194 | . '= :field' |
| 195 | 195 | . $index . ':'; |
| 196 | 196 | $bindField |
| 197 | - = $mappedFields[$index]; |
|
| 197 | + = $mappedFields[$index]; |
|
| 198 | 198 | $parameters['bind']['field' . $index] = $currentDeleteRecord->$bindField; |
| 199 | 199 | } |
| 200 | 200 | $relatedRecords = $relatedModel::find($parameters); |
@@ -70,7 +70,7 @@ discard block |
||
| 70 | 70 | $moduleDir = PbxExtensionUtils::getModuleDir($module['uniqid']); |
| 71 | 71 | |
| 72 | 72 | $moduleJson = "{$moduleDir}/module.json"; |
| 73 | - if ( ! file_exists($moduleJson)) { |
|
| 73 | + if (!file_exists($moduleJson)) { |
|
| 74 | 74 | continue; |
| 75 | 75 | } |
| 76 | 76 | $jsonString = file_get_contents($moduleJson); |
@@ -81,7 +81,7 @@ discard block |
||
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | $moduleModelsDir = "{$moduleDir}/Models"; |
| 84 | - $results = glob($moduleModelsDir . '/*.php', GLOB_NOSORT); |
|
| 84 | + $results = glob($moduleModelsDir.'/*.php', GLOB_NOSORT); |
|
| 85 | 85 | foreach ($results as $file) { |
| 86 | 86 | $className = pathinfo($file)['filename']; |
| 87 | 87 | $moduleModelClass = "\\Modules\\{$module['uniqid']}\\Models\\{$className}"; |
@@ -116,16 +116,16 @@ discard block |
||
| 116 | 116 | $newErrorMessage = $this->t('ConstraintViolation'); |
| 117 | 117 | $newErrorMessage .= "<ul class='list'>"; |
| 118 | 118 | if ($relatedRecords === false) { |
| 119 | - throw new Model\Exception('Error on models relationship ' . $errorMessage); |
|
| 119 | + throw new Model\Exception('Error on models relationship '.$errorMessage); |
|
| 120 | 120 | } |
| 121 | 121 | if ($relatedRecords instanceof Resultset) { |
| 122 | 122 | foreach ($relatedRecords as $item) { |
| 123 | 123 | if ($item instanceof ModelsBase) { |
| 124 | - $newErrorMessage .= '<li>' . $item->getRepresent(true) . '</li>'; |
|
| 124 | + $newErrorMessage .= '<li>'.$item->getRepresent(true).'</li>'; |
|
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | } elseif ($relatedRecords instanceof ModelsBase) { |
| 128 | - $newErrorMessage .= '<li>' . $relatedRecords->getRepresent(true) . '</li>'; |
|
| 128 | + $newErrorMessage .= '<li>'.$relatedRecords->getRepresent(true).'</li>'; |
|
| 129 | 129 | } else { |
| 130 | 130 | $newErrorMessage .= '<li>Unknown object</li>'; |
| 131 | 131 | } |
@@ -176,7 +176,7 @@ discard block |
||
| 176 | 176 | if (empty($this->id)) { |
| 177 | 177 | $name .= $this->t('mo_NewElementCallQueues'); |
| 178 | 178 | } else { |
| 179 | - $name .= $this->t('mo_CallQueueShort4Dropdown') . ': ' . $this->name; |
|
| 179 | + $name .= $this->t('mo_CallQueueShort4Dropdown').': '.$this->name; |
|
| 180 | 180 | } |
| 181 | 181 | break; |
| 182 | 182 | case ConferenceRooms::class: |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | if (empty($this->id)) { |
| 185 | 185 | $name .= $this->t('mo_NewElementConferenceRooms'); |
| 186 | 186 | } else { |
| 187 | - $name .= $this->t('mo_ConferenceRoomsShort4Dropdown') . ': ' . $this->name; |
|
| 187 | + $name .= $this->t('mo_ConferenceRoomsShort4Dropdown').': '.$this->name; |
|
| 188 | 188 | } |
| 189 | 189 | break; |
| 190 | 190 | case CustomFiles::class: |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | if (empty($this->id)) { |
| 196 | 196 | $name .= $this->t('mo_NewElementDialplanApplications'); |
| 197 | 197 | } else { |
| 198 | - $name .= $this->t('mo_ApplicationShort4Dropdown') . ': ' . $this->name; |
|
| 198 | + $name .= $this->t('mo_ApplicationShort4Dropdown').': '.$this->name; |
|
| 199 | 199 | } |
| 200 | 200 | break; |
| 201 | 201 | case ExtensionForwardingRights::class: |
@@ -257,7 +257,7 @@ discard block |
||
| 257 | 257 | if (empty($this->id)) { |
| 258 | 258 | $name .= $this->t('mo_NewElementIax'); |
| 259 | 259 | } elseif ($this->disabled === '1') { |
| 260 | - $name .= "{$this->description} ({$this->t( 'mo_Disabled' )})"; |
|
| 260 | + $name .= "{$this->description} ({$this->t('mo_Disabled')})"; |
|
| 261 | 261 | } else { |
| 262 | 262 | $name .= $this->description; |
| 263 | 263 | } |
@@ -267,7 +267,7 @@ discard block |
||
| 267 | 267 | if (empty($this->id)) { |
| 268 | 268 | $name .= $this->t('mo_NewElementIvrMenu'); |
| 269 | 269 | } else { |
| 270 | - $name .= $this->t('mo_IVRMenuShort4Dropdown') . ': ' . $this->name; |
|
| 270 | + $name .= $this->t('mo_IVRMenuShort4Dropdown').': '.$this->name; |
|
| 271 | 271 | } |
| 272 | 272 | break; |
| 273 | 273 | case IvrMenuActions::class: |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | $name = '<i class="map signs icon"></i> '; |
| 281 | 281 | if (empty($this->id)) { |
| 282 | 282 | $name .= $this->t('mo_NewElementIncomingRoutingTable'); |
| 283 | - } elseif ( ! empty($this->note)) { |
|
| 283 | + } elseif (!empty($this->note)) { |
|
| 284 | 284 | $name .= $this->t('repIncomingRoutingTable', ['represent' => $this->note]); |
| 285 | 285 | } else { |
| 286 | 286 | $name .= $this->t('repIncomingRoutingTableNumber', ['represent' => $this->id]); |
@@ -295,8 +295,8 @@ discard block |
||
| 295 | 295 | if (empty($this->id)) { |
| 296 | 296 | $name .= $this->t('mo_NewElementNetworkFilters'); |
| 297 | 297 | } else { |
| 298 | - $name .= $this->description . '(' |
|
| 299 | - . $this->t('fw_PermitNetwork') . ': ' . $this->permit |
|
| 298 | + $name .= $this->description.'(' |
|
| 299 | + . $this->t('fw_PermitNetwork').': '.$this->permit |
|
| 300 | 300 | . ')'; |
| 301 | 301 | } |
| 302 | 302 | break; |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | $name = '<i class="random icon"></i> '; |
| 305 | 305 | if (empty($this->id)) { |
| 306 | 306 | $name .= $this->t('mo_NewElementOutgoingRoutingTable'); |
| 307 | - } elseif ( ! empty($this->rulename)) { |
|
| 307 | + } elseif (!empty($this->rulename)) { |
|
| 308 | 308 | $name .= $this->t('repOutgoingRoutingTable', ['represent' => $this->rulename]); |
| 309 | 309 | } else { |
| 310 | 310 | $name .= $this->t('repOutgoingRoutingTableNumber', ['represent' => $this->id]); |
@@ -314,24 +314,24 @@ discard block |
||
| 314 | 314 | $name = '<i class="time icon"></i> '; |
| 315 | 315 | if (empty($this->id)) { |
| 316 | 316 | $name .= $this->t('mo_NewElementOutWorkTimes'); |
| 317 | - } elseif ( ! empty($this->description)) { |
|
| 317 | + } elseif (!empty($this->description)) { |
|
| 318 | 318 | $name .= $this->t('repOutWorkTimes', ['represent' => $this->description]); |
| 319 | 319 | } else { |
| 320 | 320 | $represent = ''; |
| 321 | 321 | if (is_numeric($this->date_from)) { |
| 322 | - $represent .= date("d/m/Y", $this->date_from) . '-'; |
|
| 322 | + $represent .= date("d/m/Y", $this->date_from).'-'; |
|
| 323 | 323 | } |
| 324 | 324 | if (is_numeric($this->date_to)) { |
| 325 | - $represent .= date("d/m/Y", $this->date_to) . ' '; |
|
| 325 | + $represent .= date("d/m/Y", $this->date_to).' '; |
|
| 326 | 326 | } |
| 327 | 327 | if (isset($this->weekday_from)) { |
| 328 | - $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_from} days"))) . '-'; |
|
| 328 | + $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_from} days"))).'-'; |
|
| 329 | 329 | } |
| 330 | 330 | if (isset($this->weekday_to)) { |
| 331 | - $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_to} days"))) . ' '; |
|
| 331 | + $represent .= $this->t(date('D', strtotime("Sunday +{$this->weekday_to} days"))).' '; |
|
| 332 | 332 | } |
| 333 | 333 | if (isset($this->time_from) || isset($this->time_to)) { |
| 334 | - $represent .= $this->time_from . ' - ' . $this->time_to . ' '; |
|
| 334 | + $represent .= $this->time_from.' - '.$this->time_to.' '; |
|
| 335 | 335 | } |
| 336 | 336 | $name .= $this->t('repOutWorkTimes', ['represent' => $represent]); |
| 337 | 337 | } |
@@ -348,7 +348,7 @@ discard block |
||
| 348 | 348 | break; |
| 349 | 349 | case PbxExtensionModules::class: |
| 350 | 350 | $name = '<i class="puzzle piece icon"></i> ' |
| 351 | - . $this->t('mo_ModuleShort4Dropdown') . ': ' |
|
| 351 | + . $this->t('mo_ModuleShort4Dropdown').': ' |
|
| 352 | 352 | . $this->name; |
| 353 | 353 | break; |
| 354 | 354 | case Sip::class: |
@@ -356,14 +356,14 @@ discard block |
||
| 356 | 356 | if (empty($this->id)) { |
| 357 | 357 | $name .= $this->t('mo_NewElementSip'); |
| 358 | 358 | } elseif ($this->disabled === '1') { |
| 359 | - $name .= "{$this->description} ({$this->t( 'mo_Disabled' )})"; |
|
| 359 | + $name .= "{$this->description} ({$this->t('mo_Disabled')})"; |
|
| 360 | 360 | } else { |
| 361 | 361 | $name .= $this->description; |
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | break; |
| 365 | 365 | case Users::class: |
| 366 | - $name = '<i class="user outline icon"></i> ' . $this->username; |
|
| 366 | + $name = '<i class="user outline icon"></i> '.$this->username; |
|
| 367 | 367 | break; |
| 368 | 368 | case SoundFiles::class: |
| 369 | 369 | $name = '<i class="file audio outline icon"></i> '; |
@@ -382,7 +382,7 @@ discard block |
||
| 382 | 382 | $link = $this->getWebInterfaceLink(); |
| 383 | 383 | $category = explode('\\', static::class)[3]; |
| 384 | 384 | $result = $this->t( |
| 385 | - 'rep' . $category, |
|
| 385 | + 'rep'.$category, |
|
| 386 | 386 | [ |
| 387 | 387 | 'represent' => "<a href='{$link}'>{$name}</a>", |
| 388 | 388 | ] |
@@ -407,7 +407,7 @@ discard block |
||
| 407 | 407 | |
| 408 | 408 | if (strlen($s) > $max_length) { |
| 409 | 409 | $offset = ($max_length - 3) - strlen($s); |
| 410 | - $s = substr($s, 0, strrpos($s, ' ', $offset)) . '...'; |
|
| 410 | + $s = substr($s, 0, strrpos($s, ' ', $offset)).'...'; |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | return $s; |
@@ -426,80 +426,80 @@ discard block |
||
| 426 | 426 | $link = '#'; |
| 427 | 427 | switch (static::class) { |
| 428 | 428 | case AsteriskManagerUsers::class: |
| 429 | - $link = $url->get('asterisk-managers/modify/' . $this->id, null, null, $baseUri); |
|
| 429 | + $link = $url->get('asterisk-managers/modify/'.$this->id, null, null, $baseUri); |
|
| 430 | 430 | break; |
| 431 | 431 | case CallQueueMembers::class: |
| 432 | - $link = $url->get('call-queues/modify/' . $this->CallQueues->uniqid, null, null, $baseUri); |
|
| 432 | + $link = $url->get('call-queues/modify/'.$this->CallQueues->uniqid, null, null, $baseUri); |
|
| 433 | 433 | break; |
| 434 | 434 | case CallQueues::class: |
| 435 | - $link = $url->get('call-queues/modify/' . $this->uniqid, null, null, $baseUri); |
|
| 435 | + $link = $url->get('call-queues/modify/'.$this->uniqid, null, null, $baseUri); |
|
| 436 | 436 | break; |
| 437 | 437 | case ConferenceRooms::class: |
| 438 | - $link = $url->get('conference-rooms/modify/' . $this->uniqid, null, null, $baseUri); |
|
| 438 | + $link = $url->get('conference-rooms/modify/'.$this->uniqid, null, null, $baseUri); |
|
| 439 | 439 | break; |
| 440 | 440 | case CustomFiles::class: |
| 441 | - $link = $url->get('custom-files/modify/' . $this->id, null, null, $baseUri); |
|
| 441 | + $link = $url->get('custom-files/modify/'.$this->id, null, null, $baseUri); |
|
| 442 | 442 | break; |
| 443 | 443 | case DialplanApplications::class: |
| 444 | - $link = $url->get('dialplan-applications/modify/' . $this->uniqid, null, null, $baseUri); |
|
| 444 | + $link = $url->get('dialplan-applications/modify/'.$this->uniqid, null, null, $baseUri); |
|
| 445 | 445 | break; |
| 446 | 446 | case ExtensionForwardingRights::class: |
| 447 | 447 | |
| 448 | 448 | break; |
| 449 | 449 | case Extensions::class: |
| 450 | - $link = $url->get('extensions/modify/' . $this->id, null, null, $baseUri); |
|
| 450 | + $link = $url->get('extensions/modify/'.$this->id, null, null, $baseUri); |
|
| 451 | 451 | break; |
| 452 | 452 | case ExternalPhones::class: |
| 453 | 453 | if ($this->Extensions->is_general_user_number === "1") { |
| 454 | - $parameters = [ |
|
| 455 | - 'conditions' => 'is_general_user_number="1" AND type="' . Extensions::TYPE_EXTERNAL . '" AND userid=:userid:', |
|
| 454 | + $parameters = [ |
|
| 455 | + 'conditions' => 'is_general_user_number="1" AND type="'.Extensions::TYPE_EXTERNAL.'" AND userid=:userid:', |
|
| 456 | 456 | 'bind' => [ |
| 457 | 457 | 'userid' => $this->Extensions->userid, |
| 458 | 458 | ], |
| 459 | 459 | ]; |
| 460 | 460 | $needExtension = Extensions::findFirst($parameters); |
| 461 | - $link = $url->get('extensions/modify/' . $needExtension->id, null, null, $baseUri); |
|
| 461 | + $link = $url->get('extensions/modify/'.$needExtension->id, null, null, $baseUri); |
|
| 462 | 462 | } else { |
| 463 | - $link = '#';//TODO сделать если будет раздел для допоплнинельных номеров пользователя |
|
| 463 | + $link = '#'; //TODO сделать если будет раздел для допоплнинельных номеров пользователя |
|
| 464 | 464 | } |
| 465 | 465 | break; |
| 466 | 466 | case Fail2BanRules::class: |
| 467 | - $link = '#';//TODO сделать если будет fail2ban |
|
| 467 | + $link = '#'; //TODO сделать если будет fail2ban |
|
| 468 | 468 | break; |
| 469 | 469 | case FirewallRules::class: |
| 470 | - $link = $url->get('firewall/modify/' . $this->NetworkFilters->id, null, null, $baseUri); |
|
| 470 | + $link = $url->get('firewall/modify/'.$this->NetworkFilters->id, null, null, $baseUri); |
|
| 471 | 471 | break; |
| 472 | 472 | case Iax::class: |
| 473 | - $link = $url->get('providers/modifyiax/' . $this->Providers->id, null, null, $baseUri); |
|
| 473 | + $link = $url->get('providers/modifyiax/'.$this->Providers->id, null, null, $baseUri); |
|
| 474 | 474 | break; |
| 475 | 475 | case IvrMenu::class: |
| 476 | - $link = $url->get('ivr-menu/modify/' . $this->uniqid, null, null, $baseUri); |
|
| 476 | + $link = $url->get('ivr-menu/modify/'.$this->uniqid, null, null, $baseUri); |
|
| 477 | 477 | break; |
| 478 | 478 | case IvrMenuActions::class: |
| 479 | - $link = $url->get('ivr-menu/modify/' . $this->IvrMenu->uniqid, null, null, $baseUri); |
|
| 479 | + $link = $url->get('ivr-menu/modify/'.$this->IvrMenu->uniqid, null, null, $baseUri); |
|
| 480 | 480 | break; |
| 481 | 481 | case Codecs::class: |
| 482 | 482 | break; |
| 483 | 483 | case IncomingRoutingTable::class: |
| 484 | - $link = $url->get('incoming-routes/modify/' . $this->id, null, null, $baseUri); |
|
| 484 | + $link = $url->get('incoming-routes/modify/'.$this->id, null, null, $baseUri); |
|
| 485 | 485 | break; |
| 486 | 486 | case LanInterfaces::class: |
| 487 | 487 | $link = $url->get('network/index/', null, null, $baseUri); |
| 488 | 488 | break; |
| 489 | 489 | case NetworkFilters::class: |
| 490 | - $link = $url->get('firewall/modify/' . $this->id, null, null, $baseUri); |
|
| 490 | + $link = $url->get('firewall/modify/'.$this->id, null, null, $baseUri); |
|
| 491 | 491 | break; |
| 492 | 492 | case OutgoingRoutingTable::class: |
| 493 | - $link = $url->get('outbound-routes/modify/' . $this->id, null, null, $baseUri); |
|
| 493 | + $link = $url->get('outbound-routes/modify/'.$this->id, null, null, $baseUri); |
|
| 494 | 494 | break; |
| 495 | 495 | case OutWorkTimes::class: |
| 496 | - $link = $url->get('out-off-work-time/modify/' . $this->id, null, null, $baseUri); |
|
| 496 | + $link = $url->get('out-off-work-time/modify/'.$this->id, null, null, $baseUri); |
|
| 497 | 497 | break; |
| 498 | 498 | case Providers::class: |
| 499 | 499 | if ($this->type === "IAX") { |
| 500 | - $link = $url->get('providers/modifyiax/' . $this->uniqid, null, null, $baseUri); |
|
| 500 | + $link = $url->get('providers/modifyiax/'.$this->uniqid, null, null, $baseUri); |
|
| 501 | 501 | } else { |
| 502 | - $link = $url->get('providers/modifysip/' . $this->uniqid, null, null, $baseUri); |
|
| 502 | + $link = $url->get('providers/modifysip/'.$this->uniqid, null, null, $baseUri); |
|
| 503 | 503 | } |
| 504 | 504 | break; |
| 505 | 505 | case PbxSettings::class: |
@@ -511,26 +511,26 @@ discard block |
||
| 511 | 511 | case Sip::class: |
| 512 | 512 | if ($this->Extensions) { // Это внутренний номер? |
| 513 | 513 | if ($this->Extensions->is_general_user_number === "1") { |
| 514 | - $link = $url->get('extensions/modify/' . $this->Extensions->id, null, null, $baseUri); |
|
| 514 | + $link = $url->get('extensions/modify/'.$this->Extensions->id, null, null, $baseUri); |
|
| 515 | 515 | } else { |
| 516 | - $link = '#';//TODO сделать если будет раздел для допоплнинельных номеров пользователя |
|
| 516 | + $link = '#'; //TODO сделать если будет раздел для допоплнинельных номеров пользователя |
|
| 517 | 517 | } |
| 518 | 518 | } elseif ($this->Providers) { // Это провайдер |
| 519 | - $link = $url->get('providers/modifysip/' . $this->Providers->id, null, null, $baseUri); |
|
| 519 | + $link = $url->get('providers/modifysip/'.$this->Providers->id, null, null, $baseUri); |
|
| 520 | 520 | } |
| 521 | 521 | break; |
| 522 | 522 | case Users::class: |
| 523 | - $parameters = [ |
|
| 523 | + $parameters = [ |
|
| 524 | 524 | 'conditions' => 'userid=:userid:', |
| 525 | 525 | 'bind' => [ |
| 526 | 526 | 'userid' => $this->id, |
| 527 | 527 | ], |
| 528 | 528 | ]; |
| 529 | 529 | $needExtension = Extensions::findFirst($parameters); |
| 530 | - $link = $url->get('extensions/modify/' . $needExtension->id, null, null, $baseUri); |
|
| 530 | + $link = $url->get('extensions/modify/'.$needExtension->id, null, null, $baseUri); |
|
| 531 | 531 | break; |
| 532 | 532 | case SoundFiles::class: |
| 533 | - $link = $url->get('sound-files/modify/' . $this->id, null, null, $baseUri); |
|
| 533 | + $link = $url->get('sound-files/modify/'.$this->id, null, null, $baseUri); |
|
| 534 | 534 | break; |
| 535 | 535 | default: |
| 536 | 536 | } |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | $metaData = $this->di->get('modelsMetadata'); |
| 547 | 547 | $defaultValues = $metaData->getDefaultValues($this); |
| 548 | 548 | foreach ($defaultValues as $field => $value) { |
| 549 | - if ( ! isset($this->{$field})) { |
|
| 549 | + if (!isset($this->{$field})) { |
|
| 550 | 550 | $this->{$field} = $value; |
| 551 | 551 | } |
| 552 | 552 | } |
@@ -680,7 +680,7 @@ discard block |
||
| 680 | 680 | = $currentDeleteRecord->_modelsManager->getRelations(get_class($currentDeleteRecord)); |
| 681 | 681 | foreach ($relations as $relation) { |
| 682 | 682 | $foreignKey = $relation->getOption('foreignKey'); |
| 683 | - if ( ! array_key_exists('action', $foreignKey)) { |
|
| 683 | + if (!array_key_exists('action', $foreignKey)) { |
|
| 684 | 684 | continue; |
| 685 | 685 | } |
| 686 | 686 | // Check if there are some record which restrict delete current record |
@@ -698,10 +698,10 @@ discard block |
||
| 698 | 698 | ? ' OR ' : ''; |
| 699 | 699 | $parameters['conditions'] .= $referencedField |
| 700 | 700 | . '= :field' |
| 701 | - . $index . ':'; |
|
| 701 | + . $index.':'; |
|
| 702 | 702 | $bindField |
| 703 | 703 | = $mappedFields[$index]; |
| 704 | - $parameters['bind']['field' . $index] = $currentDeleteRecord->$bindField; |
|
| 704 | + $parameters['bind']['field'.$index] = $currentDeleteRecord->$bindField; |
|
| 705 | 705 | } |
| 706 | 706 | $relatedRecords = $relatedModel::find($parameters); |
| 707 | 707 | switch ($foreignKey['action']) { |
@@ -775,7 +775,7 @@ discard block |
||
| 775 | 775 | if (php_sapi_name() === 'cli') { |
| 776 | 776 | return; |
| 777 | 777 | } |
| 778 | - if ( ! $this->hasSnapshotData()) { |
|
| 778 | + if (!$this->hasSnapshotData()) { |
|
| 779 | 779 | return; |
| 780 | 780 | } // nothing changed |
| 781 | 781 | |
@@ -797,7 +797,7 @@ discard block |
||
| 797 | 797 | { |
| 798 | 798 | // Add changed fields set to Beanstalkd queue |
| 799 | 799 | $queue = $this->di->getShared('beanstalkConnectionModels'); |
| 800 | - if ($queue===null){ |
|
| 800 | + if ($queue === null) { |
|
| 801 | 801 | return; |
| 802 | 802 | } |
| 803 | 803 | if ($this instanceof PbxSettings) { |
