@@ -32,14 +32,14 @@ discard block |
||
32 | 32 | $orign_chan = $agi->get_variable("orign_chan", true); |
33 | 33 | $id = $agi->get_variable("pt1c_UNIQUEID", true); |
34 | 34 | $IS_ORGNT = $agi->get_variable("IS_ORGNT", true); |
35 | - if ($id == '' || ! empty($QUEUE_SRC_CHAN)) { |
|
35 | + if ($id == '' || !empty($QUEUE_SRC_CHAN)) { |
|
36 | 36 | // Если это вызов на агента очереди !empty($QUEUE_SRC_CHAN). |
37 | 37 | // Если это новый вызов $id == ''. |
38 | - $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
38 | + $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
39 | 39 | } |
40 | 40 | // Канал, AGI скрипта. |
41 | 41 | $channel = $agi->request['agi_channel']; |
42 | - $is_local = ! (stripos($channel, 'local/') === false); |
|
42 | + $is_local = !(stripos($channel, 'local/') === false); |
|
43 | 43 | if ($QUEUE_SRC_CHAN != '' && $is_local) { |
44 | 44 | // Это LOCAL, Переопределим на исходный. |
45 | 45 | $channel = $QUEUE_SRC_CHAN; |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | $data['action'] = "$action"; |
57 | - if ( ! empty($IS_ORGNT)) { |
|
57 | + if (!empty($IS_ORGNT)) { |
|
58 | 58 | $dst_num = $agi->request['agi_callerid']; |
59 | 59 | $src_num = $agi->request['agi_extension']; |
60 | 60 | $data['dialstatus'] = 'ORIGINATE'; |
@@ -65,9 +65,9 @@ discard block |
||
65 | 65 | $num = substr($agi->request['agi_channel'], $p_start, $p_end); |
66 | 66 | |
67 | 67 | $p_start = strpos($agi->request['agi_channel'], ';'); |
68 | - $dst_chan = substr($agi->request['agi_channel'], 0, $p_start) . ';1'; |
|
68 | + $dst_chan = substr($agi->request['agi_channel'], 0, $p_start).';1'; |
|
69 | 69 | |
70 | - $id = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $num . '_' . $IS_ORGNT; |
|
70 | + $id = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$num.'_'.$IS_ORGNT; |
|
71 | 71 | $data['dst_chan'] = $dst_chan; |
72 | 72 | } else { |
73 | 73 | $src_num = $agi->request['agi_callerid']; |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $data['agi_channel'] = $agi->request['agi_channel']; |
85 | 85 | $data['did'] = $agi->get_variable("FROM_DID", true); |
86 | 86 | $data['from_account'] = $from_account; |
87 | - $data['IS_ORGNT'] = ! empty($IS_ORGNT); |
|
87 | + $data['IS_ORGNT'] = !empty($IS_ORGNT); |
|
88 | 88 | |
89 | 89 | $agi->set_variable("__pt1c_UNIQUEID", "$id"); |
90 | 90 | |
@@ -115,13 +115,13 @@ discard block |
||
115 | 115 | } |
116 | 116 | |
117 | 117 | $IS_ORGNT = $agi->get_variable("IS_ORGNT", true); |
118 | - if ( ! empty($IS_ORGNT)) { |
|
118 | + if (!empty($IS_ORGNT)) { |
|
119 | 119 | // Вероятно необходимо переопределить искать по двум ID. |
120 | 120 | // Применимо только для Originate, когда в качестве звонящего используем два канала |
121 | 121 | // мобильный и внутренний номер. |
122 | 122 | $peer_mobile = $agi->get_variable("peer_mobile", true); |
123 | - if ( ! empty($peer_mobile) && stripos($id, $peer_mobile) === false) { |
|
124 | - $id = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $peer_mobile . '_' . $IS_ORGNT; |
|
123 | + if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) { |
|
124 | + $id = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT; |
|
125 | 125 | $data['org_id'] = $id; |
126 | 126 | } |
127 | 127 | } |
@@ -154,22 +154,22 @@ discard block |
||
154 | 154 | $data['BRIDGEPEER'] = $agi->get_variable("FROM_CHAN", true); |
155 | 155 | |
156 | 156 | $IS_ORGNT = $agi->get_variable("IS_ORGNT", true); |
157 | - if ( ! empty($IS_ORGNT)) { |
|
157 | + if (!empty($IS_ORGNT)) { |
|
158 | 158 | // Вероятно необходимо переопределить ID. |
159 | 159 | // Применимо только для Originate, когда в качестве звонящего используем два канала |
160 | 160 | // мобильный и внутренний номер. |
161 | 161 | $peer_mobile = $agi->get_variable("peer_mobile", true); |
162 | - if ( ! empty($peer_mobile) && stripos($id, $peer_mobile) === false) { |
|
163 | - $id = substr($agi->request['agi_uniqueid'], 0, 16) . '_' . $peer_mobile . '_' . $IS_ORGNT; |
|
162 | + if (!empty($peer_mobile) && stripos($id, $peer_mobile) === false) { |
|
163 | + $id = substr($agi->request['agi_uniqueid'], 0, 16).'_'.$peer_mobile.'_'.$IS_ORGNT; |
|
164 | 164 | $data['org_id'] = $id; |
165 | 165 | } |
166 | 166 | } |
167 | 167 | |
168 | - if ( ! empty($data['ENDCALLONANSWER'])) { |
|
168 | + if (!empty($data['ENDCALLONANSWER'])) { |
|
169 | 169 | $agi->set_variable("__ENDCALLONANSWER", ""); |
170 | 170 | } |
171 | 171 | |
172 | - $PICKUPEER = trim('' . $agi->get_variable("PICKUPEER", true)); |
|
172 | + $PICKUPEER = trim(''.$agi->get_variable("PICKUPEER", true)); |
|
173 | 173 | $data['dnid'] = $agi->request['agi_dnid']; |
174 | 174 | $mikoPBXConfig = new MikoPBXConfig(); |
175 | 175 | $pickupexten = $mikoPBXConfig->getGeneralSettings('PickupExten'); |
@@ -184,7 +184,7 @@ discard block |
||
184 | 184 | // Очищаем переменную канала. Больше не требуется. |
185 | 185 | $agi->set_variable("PICKUPEER", ""); |
186 | 186 | $data['old_id'] = $id; |
187 | - $data['id'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
187 | + $data['id'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
188 | 188 | } |
189 | 189 | $agi->set_variable("__pt1c_UNIQUEID", "$id"); |
190 | 190 | |
@@ -211,7 +211,7 @@ discard block |
||
211 | 211 | $data['linkedid'] = $agi->get_variable("CDR(linkedid)", true); |
212 | 212 | $data['did'] = $agi->get_variable("FROM_DID", true); |
213 | 213 | |
214 | - $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
214 | + $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
215 | 215 | |
216 | 216 | return $data; |
217 | 217 | } |
@@ -227,12 +227,12 @@ discard block |
||
227 | 227 | function Event_transfer_dial($agi, $action) |
228 | 228 | { |
229 | 229 | $now = Util::getNowDate(); |
230 | - $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
230 | + $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
231 | 231 | |
232 | 232 | // Пытаемся определить канал. |
233 | 233 | $TRANSFERERNAME = $agi->get_variable("TRANSFERERNAME", true); |
234 | 234 | $QUEUE_SRC_CHAN = $agi->get_variable("QUEUE_SRC_CHAN", true); |
235 | - $is_local = ! (stripos($TRANSFERERNAME, 'local/') === false); |
|
235 | + $is_local = !(stripos($TRANSFERERNAME, 'local/') === false); |
|
236 | 236 | if ($QUEUE_SRC_CHAN != '' && $is_local) { |
237 | 237 | // Это LOCAL, Переопределим на исходный. |
238 | 238 | $channel = $QUEUE_SRC_CHAN; |
@@ -247,7 +247,7 @@ discard block |
||
247 | 247 | |
248 | 248 | $data = []; |
249 | 249 | $data['action'] = "$action"; |
250 | - $data['agi_channel'] = $channel;// $agi->request['agi_channel']; |
|
250 | + $data['agi_channel'] = $channel; // $agi->request['agi_channel']; |
|
251 | 251 | $data['linkedid'] = $agi->get_variable("CDR(linkedid)", true); |
252 | 252 | $data['src_chan'] = $channel; |
253 | 253 | $data['did'] = $agi->get_variable("FROM_DID", true); |
@@ -321,7 +321,7 @@ discard block |
||
321 | 321 | $data['did'] = $agi->get_variable("FROM_DID", true); |
322 | 322 | $data['action'] = "$action"; |
323 | 323 | $data['agi_channel'] = $agi->request['agi_channel']; |
324 | - $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
324 | + $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
325 | 325 | |
326 | 326 | $pos = stripos($data['agi_channel'], 'local/'); |
327 | 327 | if ($pos === false) { |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | $data = []; |
351 | 351 | $data['action'] = "$action"; |
352 | 352 | $data['did'] = $agi->get_variable("FROM_DID", true); |
353 | - $data['agi_threadid'] = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
353 | + $data['agi_threadid'] = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
354 | 354 | |
355 | 355 | $data['linkedid'] = $agi->get_variable("CDR(linkedid)", true); |
356 | 356 | $data['dialstatus'] = $agi->get_variable("DIALSTATUS", true); |
@@ -385,7 +385,7 @@ discard block |
||
385 | 385 | $agi->set_variable("pt1c_PARK_CHAN", $park_row['ParkeeChannel']); |
386 | 386 | |
387 | 387 | // Сбор данных для генерации CDR. |
388 | - $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
388 | + $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
389 | 389 | $channel = $agi->request['agi_channel']; |
390 | 390 | $agi->set_variable("__pt1c_UNIQUEID", "$id"); |
391 | 391 | $data = []; |
@@ -403,7 +403,7 @@ discard block |
||
403 | 403 | $data['src_chan'] = $channel; |
404 | 404 | $data['src_num'] = $agi->request['agi_callerid']; |
405 | 405 | $data['dst_num'] = $agi->request['agi_extension']; |
406 | - $data['dst_chan'] = 'Park:' . $agi->request['agi_extension']; |
|
406 | + $data['dst_chan'] = 'Park:'.$agi->request['agi_extension']; |
|
407 | 407 | } elseif (true === $park_row['pt1c_is_dst']) { |
408 | 408 | $data['src_chan'] = $channel; |
409 | 409 | $data['dst_chan'] = $park_row['ParkeeChannel']; |
@@ -419,11 +419,11 @@ discard block |
||
419 | 419 | if (trim($park_row['ParkingDuration']) !== '') { |
420 | 420 | $time_start = date("Y-m-d H:i:s", time() - 1 * ($park_row['ParkingDuration'])); |
421 | 421 | $data_parking = [ |
422 | - 'UNIQUEID' => $id . '_' . Util::generateRandomString(3), |
|
422 | + 'UNIQUEID' => $id.'_'.Util::generateRandomString(3), |
|
423 | 423 | 'src_chan' => $park_row['ParkeeChannel'], |
424 | 424 | 'src_num' => $park_row['ParkeeCallerIDNum'], |
425 | 425 | 'dst_num' => $park_row['ParkingSpace'], |
426 | - 'dst_chan' => 'Park:' . $park_row['ParkingSpace'], |
|
426 | + 'dst_chan' => 'Park:'.$park_row['ParkingSpace'], |
|
427 | 427 | 'start' => $time_start, |
428 | 428 | 'answer' => $time_start, |
429 | 429 | 'endtime' => $now, |
@@ -448,7 +448,7 @@ discard block |
||
448 | 448 | function Event_unpark_call_timeout($agi, $action) |
449 | 449 | { |
450 | 450 | $now = Util::getNowDate(); |
451 | - $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
451 | + $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
452 | 452 | // PARKER=SIP/206 |
453 | 453 | $PARKING_DURATION = $agi->get_variable("PARKING_DURATION", true); |
454 | 454 | $PARKING_DURATION = ($PARKING_DURATION == '') ? 45 : $PARKING_DURATION; |
@@ -460,7 +460,7 @@ discard block |
||
460 | 460 | 'src_chan' => $agi->request['agi_channel'], // $agi->get_variable("PARKER", true), // ??? |
461 | 461 | 'src_num' => $agi->request['agi_callerid'], |
462 | 462 | 'dst_num' => $PARKING_SPACE, |
463 | - 'dst_chan' => 'Park:' . $PARKING_SPACE, |
|
463 | + 'dst_chan' => 'Park:'.$PARKING_SPACE, |
|
464 | 464 | 'start' => $time_start, |
465 | 465 | 'answer' => $time_start, |
466 | 466 | 'endtime' => $now, |
@@ -472,7 +472,7 @@ discard block |
||
472 | 472 | ]; |
473 | 473 | |
474 | 474 | |
475 | - $id2 = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
475 | + $id2 = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
476 | 476 | $agi->set_variable("__pt1c_UNIQUEID", "$id2"); |
477 | 477 | |
478 | 478 | return $data; |
@@ -493,8 +493,8 @@ discard block |
||
493 | 493 | $id = $agi->get_variable("pt1c_UNIQUEID", true); |
494 | 494 | $ISTRANSFER = $agi->get_variable("ISTRANSFER", true); |
495 | 495 | |
496 | - if (empty($id) || ! empty($ISTRANSFER)) { |
|
497 | - $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
496 | + if (empty($id) || !empty($ISTRANSFER)) { |
|
497 | + $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
498 | 498 | $time_start = $now; |
499 | 499 | } |
500 | 500 | |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | // 'src_chan' => $agi->request['agi_channel'], |
504 | 504 | // 'src_num' => $agi->request['agi_callerid'], |
505 | 505 | 'dst_num' => $agi->request['agi_extension'], |
506 | - 'dst_chan' => 'Queue:' . $agi->request['agi_extension'], |
|
506 | + 'dst_chan' => 'Queue:'.$agi->request['agi_extension'], |
|
507 | 507 | // 'answer' => $time_start, |
508 | 508 | // 'end' => $now, |
509 | 509 | 'did' => $agi->get_variable("FROM_DID", true), |
@@ -511,7 +511,7 @@ discard block |
||
511 | 511 | 'UNIQUEID' => $id, |
512 | 512 | 'linkedid' => $agi->get_variable("CDR(linkedid)", true), |
513 | 513 | ]; |
514 | - if ( ! empty($time_start)) { |
|
514 | + if (!empty($time_start)) { |
|
515 | 515 | $data['src_chan'] = $agi->get_variable("QUEUE_SRC_CHAN", true); |
516 | 516 | $data['src_num'] = $agi->request['agi_callerid']; |
517 | 517 | $data['start'] = $time_start; |
@@ -519,7 +519,7 @@ discard block |
||
519 | 519 | $data['transfer'] = '0'; |
520 | 520 | $agi->set_variable("__pt1c_q_UNIQUEID", "$id"); |
521 | 521 | } |
522 | - if ( ! empty($ISTRANSFER)) { |
|
522 | + if (!empty($ISTRANSFER)) { |
|
523 | 523 | $data['transfer'] = '1'; |
524 | 524 | } else { |
525 | 525 | $data['transfer'] = '0'; |
@@ -590,7 +590,7 @@ discard block |
||
590 | 590 | |
591 | 591 | $is_conf = ($agi->get_variable('CALLERID(num)', true) === 'Conference_Room'); |
592 | 592 | $not_local = (stripos($agi->request['agi_channel'], 'local/') === false); |
593 | - if ($not_local && ! $is_conf) { |
|
593 | + if ($not_local && !$is_conf) { |
|
594 | 594 | $am = Util::getAstManager(); |
595 | 595 | $res = $am->meetMeCollectInfo($exten, ['conf_1c']); |
596 | 596 | $callid = $agi->request['agi_callerid']; |
@@ -628,7 +628,7 @@ discard block |
||
628 | 628 | } |
629 | 629 | |
630 | 630 | if (empty($id)) { |
631 | - $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
631 | + $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
632 | 632 | } |
633 | 633 | |
634 | 634 | $recordingfile = CdrDb::MeetMeSetRecFilename($id); |
@@ -637,7 +637,7 @@ discard block |
||
637 | 637 | 'src_chan' => $agi->request['agi_channel'], |
638 | 638 | 'src_num' => $src_num, |
639 | 639 | 'dst_num' => $dst_num, |
640 | - 'dst_chan' => 'MeetMe:' . $mikoidconf, |
|
640 | + 'dst_chan' => 'MeetMe:'.$mikoidconf, |
|
641 | 641 | 'start' => $time_start, |
642 | 642 | 'answer' => $time_start, |
643 | 643 | 'recordingfile' => "{$recordingfile}.mp3", |
@@ -679,7 +679,7 @@ discard block |
||
679 | 679 | $lamePath = Util::which('lame'); |
680 | 680 | $nicePath = Util::which('nice'); |
681 | 681 | $chmodPath = Util::which('chmod'); |
682 | - $command = "{$nicePath} -n 19 {$lamePath} -b 32 --silent \"{$recordingfile}.wav\" \"{$recordingfile}.mp3\" && {$chmodPath} o+r \"{$recordingfile}.mp3\""; |
|
682 | + $command = "{$nicePath} -n 19 {$lamePath} -b 32 --silent \"{$recordingfile}.wav\" \"{$recordingfile}.mp3\" && {$chmodPath} o+r \"{$recordingfile}.mp3\""; |
|
683 | 683 | Util::mwExecBg($command); |
684 | 684 | |
685 | 685 | return $data; |
@@ -695,14 +695,14 @@ discard block |
||
695 | 695 | */ |
696 | 696 | function Event_dial_app($agi, $action) |
697 | 697 | { |
698 | - $id = $agi->request['agi_uniqueid'] . '_' . Util::generateRandomString(); |
|
698 | + $id = $agi->request['agi_uniqueid'].'_'.Util::generateRandomString(); |
|
699 | 699 | $extension = $agi->get_variable("APPEXTEN", true); |
700 | 700 | if (empty($extension)) { |
701 | 701 | $extension = $agi->request['agi_extension']; |
702 | 702 | } |
703 | 703 | |
704 | 704 | $data = Event_dial($agi, $action); |
705 | - $data['dst_chan'] = 'App:' . $extension; |
|
705 | + $data['dst_chan'] = 'App:'.$extension; |
|
706 | 706 | $data['dst_num'] = $extension; |
707 | 707 | $data['is_app'] = 1; |
708 | 708 | $data['UNIQUEID'] = $id; |
@@ -743,5 +743,5 @@ discard block |
||
743 | 743 | $result = $func_name($agi, $action); |
744 | 744 | // Оповещение без задержек. |
745 | 745 | $data = base64_encode(json_encode($result)); |
746 | - $agi->exec("UserEvent", "CdrConnector,AgiData:" . base64_encode(json_encode($result))); |
|
746 | + $agi->exec("UserEvent", "CdrConnector,AgiData:".base64_encode(json_encode($result))); |
|
747 | 747 | } |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | public static function LogEvent($data): void |
27 | 27 | { |
28 | 28 | if (is_file('/tmp/debug')) { |
29 | - file_put_contents('/tmp/dial_log', $data . "\n", FILE_APPEND); |
|
29 | + file_put_contents('/tmp/dial_log', $data."\n", FILE_APPEND); |
|
30 | 30 | } |
31 | 31 | } |
32 | 32 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | $dbname = $di->getShared('config')->path('cdrDatabase.dbfile'); |
46 | 46 | } else { |
47 | 47 | $id = (int) str_replace('mikopbx-', '', $id); |
48 | - $dbname = 'cdr/' . date("Y/m/d/H/", $id) . $id . ".db"; |
|
48 | + $dbname = 'cdr/'.date("Y/m/d/H/", $id).$id.".db"; |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | return $dbname; |
@@ -69,7 +69,7 @@ discard block |
||
69 | 69 | $date = CallEventsLogs::maximum( |
70 | 70 | ['linkedid = "'.$row_cdr->linkedid.'"', 'column' => 'eventtime'] |
71 | 71 | ); |
72 | - if ( ! $row_cdr->endtime) { |
|
72 | + if (!$row_cdr->endtime) { |
|
73 | 73 | if ($date) { |
74 | 74 | $row_cdr->endtime = $date; |
75 | 75 | } elseif ($row_cdr->answer) { |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | // e.g. 10.0.2.56/21 = 10.0.0.0 |
41 | 41 | public function cidr2network($ip, $cidr) |
42 | 42 | { |
43 | - return long2ip((ip2long($ip)) & ((-1 << (32 - (int)$cidr)))); |
|
43 | + return long2ip((ip2long($ip)) & ((-1 << (32 - (int) $cidr)))); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | // convert netmask to cidr |
@@ -51,7 +51,7 @@ discard block |
||
51 | 51 | $netmask = explode(".", $netmask); |
52 | 52 | |
53 | 53 | foreach ($netmask as $octect) { |
54 | - $bits += strlen(str_replace("0", "", decbin((int)$octect))); |
|
54 | + $bits += strlen(str_replace("0", "", decbin((int) $octect))); |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | return $bits; |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | |
23 | 23 | public const SELECT_CDR_TUBE = 'select_cdr_tube'; |
24 | 24 | public const UPDATE_CDR_TUBE = 'update_cdr_tube'; |
25 | - protected int $maxProc=1; |
|
25 | + protected int $maxProc = 1; |
|
26 | 26 | |
27 | 27 | |
28 | 28 | private $client_queue; |
@@ -92,12 +92,12 @@ discard block |
||
92 | 92 | $result = json_decode($result_data, true); |
93 | 93 | if (file_exists($result)) { |
94 | 94 | $file_data = json_decode(file_get_contents($result), true); |
95 | - if(!is_dir($result)){ |
|
95 | + if (!is_dir($result)) { |
|
96 | 96 | Util::mwExec("rm -rf {$result}"); |
97 | 97 | } |
98 | 98 | $result = $file_data; |
99 | 99 | } |
100 | - if ( ! is_array($result) && ! is_object($result)) { |
|
100 | + if (!is_array($result) && !is_object($result)) { |
|
101 | 101 | return; |
102 | 102 | } |
103 | 103 | if (count($result) < 1) { |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | if (trim($row['recordingfile']) !== '') { |
115 | 115 | // Если каналов не существует с ID, то можно удалить временные файлы. |
116 | 116 | $p_info = pathinfo($row['recordingfile']); |
117 | - $fname = $p_info['dirname'] . '/' . $p_info['filename'] . '.wav'; |
|
117 | + $fname = $p_info['dirname'].'/'.$p_info['filename'].'.wav'; |
|
118 | 118 | if (file_exists($fname) && !is_dir($fname)) { |
119 | 119 | Util::mwExec("rm -rf {$fname}"); |
120 | 120 | } |
@@ -138,19 +138,19 @@ discard block |
||
138 | 138 | $row['answer'] = ''; |
139 | 139 | $billsec = 0; |
140 | 140 | |
141 | - if ( ! empty($row['recordingfile'])) { |
|
141 | + if (!empty($row['recordingfile'])) { |
|
142 | 142 | $p_info = pathinfo($row['recordingfile']); |
143 | 143 | $file_list = [ |
144 | - $p_info['dirname'] . '/' . $p_info['filename'] . '.mp3', |
|
145 | - $p_info['dirname'] . '/' . $p_info['filename'] . '.wav', |
|
146 | - $p_info['dirname'] . '/' . $p_info['filename'] . '_in.wav', |
|
147 | - $p_info['dirname'] . '/' . $p_info['filename'] . '_out.wav', |
|
144 | + $p_info['dirname'].'/'.$p_info['filename'].'.mp3', |
|
145 | + $p_info['dirname'].'/'.$p_info['filename'].'.wav', |
|
146 | + $p_info['dirname'].'/'.$p_info['filename'].'_in.wav', |
|
147 | + $p_info['dirname'].'/'.$p_info['filename'].'_out.wav', |
|
148 | 148 | ]; |
149 | 149 | foreach ($file_list as $file) { |
150 | - if ( ! file_exists($file)) { |
|
150 | + if (!file_exists($file)) { |
|
151 | 151 | continue; |
152 | 152 | } |
153 | - if(!is_dir($file)){ |
|
153 | + if (!is_dir($file)) { |
|
154 | 154 | Util::mwExec("rm -rf {$file}"); |
155 | 155 | } |
156 | 156 | } |
@@ -161,9 +161,9 @@ discard block |
||
161 | 161 | if (file_exists($row['recordingfile']) && !is_dir($row['recordingfile'])) { |
162 | 162 | Util::mwExec("rm -rf {$row['recordingfile']}"); |
163 | 163 | } |
164 | - } elseif ( ! empty($row['recordingfile']) && |
|
165 | - ! file_exists(Util::trimExtensionForFile($row['recordingfile']) . 'wav') && |
|
166 | - ! file_exists( $row['recordingfile']) ) { |
|
164 | + } elseif (!empty($row['recordingfile']) && |
|
165 | + !file_exists(Util::trimExtensionForFile($row['recordingfile']).'wav') && |
|
166 | + !file_exists($row['recordingfile'])) { |
|
167 | 167 | /** @var CallDetailRecordsTmp $rec_data */ |
168 | 168 | $rec_data = CallDetailRecordsTmp::findFirst( |
169 | 169 | "linkedid='{$row['linkedid']}' AND dst_chan='{$row['dst_chan']}'" |
@@ -229,7 +229,7 @@ discard block |
||
229 | 229 | $this->no_answered_calls[$row['linkedid']]['NOANSWER'] = false; |
230 | 230 | return; |
231 | 231 | } |
232 | - if ( ! array_key_exists($row['dst_num'], $this->internal_numbers)) { |
|
232 | + if (!array_key_exists($row['dst_num'], $this->internal_numbers)) { |
|
233 | 233 | // dst_num - не является номером сотрудника. Это исходящий. |
234 | 234 | return; |
235 | 235 | } |
@@ -30,7 +30,7 @@ discard block |
||
30 | 30 | |
31 | 31 | class WorkerLongPoolAPI extends WorkerBase |
32 | 32 | { |
33 | - protected int $maxProc=1; |
|
33 | + protected int $maxProc = 1; |
|
34 | 34 | |
35 | 35 | public function start($argv): void |
36 | 36 | { |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | $this->setChannelsData(); |
47 | 47 | if (is_array($data) && isset($data['infos'])) { |
48 | 48 | foreach ($data['infos'] as $channel_data) { |
49 | - $url = 'http://localhost/pbxcore/api/long/pub?id=' . $channel_data['channel']; |
|
49 | + $url = 'http://localhost/pbxcore/api/long/pub?id='.$channel_data['channel']; |
|
50 | 50 | |
51 | 51 | $data_for_send = $this->execFunction($channel_data['channel']); |
52 | 52 | if ($data_for_send) { |
@@ -54,7 +54,7 @@ discard block |
||
54 | 54 | $this->postData($url, "$data_for_send\n"); |
55 | 55 | } |
56 | 56 | |
57 | - if ( ! isset($COMMON_CNANNELS[$channel_data['channel']])) { |
|
57 | + if (!isset($COMMON_CNANNELS[$channel_data['channel']])) { |
|
58 | 58 | continue; |
59 | 59 | } |
60 | 60 | |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | private function execFunction($channel, $common_chan = null) |
132 | 132 | { |
133 | 133 | clearstatcache(); |
134 | - if ( ! $this->checkAction($channel, $common_chan)) { |
|
134 | + if (!$this->checkAction($channel, $common_chan)) { |
|
135 | 135 | return ''; |
136 | 136 | } |
137 | 137 | $data_for_send = null; |
@@ -162,18 +162,18 @@ discard block |
||
162 | 162 | */ |
163 | 163 | private function checkAction($channel, $common_chan = null) |
164 | 164 | { |
165 | - if ( ! $common_chan) { |
|
165 | + if (!$common_chan) { |
|
166 | 166 | $actions = $GLOBALS['ACTIONS']; |
167 | 167 | } else { |
168 | 168 | $actions = $GLOBALS['COMMON_CNANNELS'][$common_chan]; |
169 | 169 | } |
170 | 170 | |
171 | 171 | $enable = false; |
172 | - if ( ! $actions) { |
|
172 | + if (!$actions) { |
|
173 | 173 | return $enable; |
174 | 174 | } |
175 | 175 | // $data = null; |
176 | - $now = time(); |
|
176 | + $now = time(); |
|
177 | 177 | |
178 | 178 | $action_data = $actions[$channel] ?? null; |
179 | 179 | if ($action_data !== null) { |
@@ -63,17 +63,17 @@ discard block |
||
63 | 63 | echo $killPath.' -QUIT '.$pid."\n"; |
64 | 64 | } |
65 | 65 | $timeStart = time(); |
66 | - while (true){ |
|
67 | - if(time() - $timeStart > 20){ |
|
66 | + while (true) { |
|
67 | + if (time() - $timeStart > 20) { |
|
68 | 68 | break; |
69 | 69 | } |
70 | 70 | usleep(50000); |
71 | 71 | $pid = Util::getPidOfProcess('nginx: master process'); |
72 | - if($pid !== ''){ |
|
72 | + if ($pid !== '') { |
|
73 | 73 | continue; |
74 | 74 | } |
75 | 75 | $result = Util::mwExec($NginxPath); |
76 | - if($result === 0){ |
|
76 | + if ($result === 0) { |
|
77 | 77 | break; |
78 | 78 | } |
79 | 79 | echo "RESULT -- $result\n"; |
@@ -111,9 +111,9 @@ discard block |
||
111 | 111 | |
112 | 112 | $RedirectToHttps = $this->mikoPBXConfig->getGeneralSettings('RedirectToHttps'); |
113 | 113 | if ($RedirectToHttps === '1' && $not_ssl === false) { |
114 | - $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {' . PHP_EOL |
|
115 | - . ' ' . 'return 301 https://$host:' . $WEBHTTPSPort . '$request_uri;' . PHP_EOL |
|
116 | - . ' }' . PHP_EOL; |
|
114 | + $conf_data = 'if ( $remote_addr != "127.0.0.1" ) {'.PHP_EOL |
|
115 | + . ' '.'return 301 https://$host:'.$WEBHTTPSPort.'$request_uri;'.PHP_EOL |
|
116 | + . ' }'.PHP_EOL; |
|
117 | 117 | $config = str_replace('include mikopbx/locations/*.conf;', $conf_data, $config); |
118 | 118 | } |
119 | 119 | file_put_contents($httpConfigFile, $config); |
@@ -123,8 +123,8 @@ discard block |
||
123 | 123 | $WEBHTTPSPrivateKey = $this->mikoPBXConfig->getGeneralSettings('WEBHTTPSPrivateKey'); |
124 | 124 | if ( |
125 | 125 | $not_ssl === false |
126 | - && ! empty($WEBHTTPSPublicKey) |
|
127 | - && ! empty($WEBHTTPSPrivateKey) |
|
126 | + && !empty($WEBHTTPSPublicKey) |
|
127 | + && !empty($WEBHTTPSPrivateKey) |
|
128 | 128 | ) { |
129 | 129 | $public_filename = '/etc/ssl/certs/nginx.crt'; |
130 | 130 | $private_filename = '/etc/ssl/private/nginx.key'; |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | |
140 | 140 | // Test work |
141 | 141 | $currentConfigIsGood = $this->testCurrentNginxConfig(); |
142 | - if ($level < 1 && ! $currentConfigIsGood) { |
|
142 | + if ($level < 1 && !$currentConfigIsGood) { |
|
143 | 143 | ++$level; |
144 | 144 | Util::sysLogMsg('nginx', 'Failed test config file. SSL will be disable...'); |
145 | 145 | $this->generateConf(true, $level); |
@@ -168,9 +168,9 @@ discard block |
||
168 | 168 | */ |
169 | 169 | public function generateModulesConf(): void |
170 | 170 | { |
171 | - $locationsPath = self::MODULES_LOCATIONS_PATH; |
|
172 | - if (!is_dir($locationsPath)){ |
|
173 | - Util::mwMkdir($locationsPath,true); |
|
171 | + $locationsPath = self::MODULES_LOCATIONS_PATH; |
|
172 | + if (!is_dir($locationsPath)) { |
|
173 | + Util::mwMkdir($locationsPath, true); |
|
174 | 174 | } |
175 | 175 | $additionalModules = $this->di->getShared('pbxConfModules'); |
176 | 176 | $rmPath = Util::which('rm'); |
@@ -178,12 +178,12 @@ discard block |
||
178 | 178 | foreach ($additionalModules as $appClass) { |
179 | 179 | if (method_exists($appClass, 'createNginxLocations')) { |
180 | 180 | $locationContent = $appClass->createNginxLocations(); |
181 | - if ( ! empty($locationContent)) { |
|
181 | + if (!empty($locationContent)) { |
|
182 | 182 | $confFileName = "{$locationsPath}/{$appClass->moduleUniqueId}.conf"; |
183 | 183 | file_put_contents($confFileName, $locationContent); |
184 | - if ( ! $this->testCurrentNginxConfig()) { |
|
184 | + if (!$this->testCurrentNginxConfig()) { |
|
185 | 185 | Util::mwExec("{$rmPath} {$confFileName}"); |
186 | - Util::sysLogMsg('nginx', 'Failed test config file for module' . $appClass->moduleUniqueId); |
|
186 | + Util::sysLogMsg('nginx', 'Failed test config file for module'.$appClass->moduleUniqueId); |
|
187 | 187 | } |
188 | 188 | } |
189 | 189 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | protected function generateConfigProtected(): void |
20 | 20 | { |
21 | 21 | $conf = ""; |
22 | - file_put_contents($this->config->path('asterisk.astetcdir') . '/confbridge.conf', $conf); |
|
22 | + file_put_contents($this->config->path('asterisk.astetcdir').'/confbridge.conf', $conf); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $conf = ''; |
33 | 33 | $data = ConferenceRooms::find(['order' => 'extension']); |
34 | 34 | foreach ($data as $conference) { |
35 | - $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)" . "\n"; |
|
35 | + $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)"."\n"; |
|
36 | 36 | } |
37 | 37 | $conf .= "\n"; |
38 | 38 | |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $conf = ''; |
48 | 48 | $data = ConferenceRooms::find(['order' => 'extension']); |
49 | 49 | foreach ($data as $conference) { |
50 | - $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)" . "\n"; |
|
50 | + $conf .= "exten => {$conference->extension},1,Goto(conference-rooms,{$conference->extension},1)"."\n"; |
|
51 | 51 | } |
52 | 52 | $conf .= "\n"; |
53 | 53 | |
@@ -72,13 +72,13 @@ discard block |
||
72 | 72 | $conf .= "[conference-rooms] \n"; |
73 | 73 | $data = ConferenceRooms::find(['order' => 'extension']); |
74 | 74 | foreach ($data as $conference) { |
75 | - $conf .= 'exten => ' . $conference->extension . ',1,NoOp(---)' . "\n\t"; |
|
76 | - $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Hangup())' . "\n\t"; |
|
77 | - $conf .= 'same => n,AGI(cdr_connector.php,meetme_dial)' . "\n\t"; |
|
78 | - $conf .= 'same => n,Answer()' . "\n\t"; |
|
79 | - $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler_meetme,s,1)' . "\n\t"; |
|
80 | - $conf .= 'same => n,Meetme(${EXTEN},qdMT' . $rec_options . ')' . "\n\t"; |
|
81 | - $conf .= 'same => n,Hangup()' . "\n\n"; |
|
75 | + $conf .= 'exten => '.$conference->extension.',1,NoOp(---)'."\n\t"; |
|
76 | + $conf .= 'same => n,ExecIf($["${CHANNEL(channeltype)}" == "Local"]?Hangup())'."\n\t"; |
|
77 | + $conf .= 'same => n,AGI(cdr_connector.php,meetme_dial)'."\n\t"; |
|
78 | + $conf .= 'same => n,Answer()'."\n\t"; |
|
79 | + $conf .= 'same => n,Set(CHANNEL(hangup_handler_wipe)=hangup_handler_meetme,s,1)'."\n\t"; |
|
80 | + $conf .= 'same => n,Meetme(${EXTEN},qdMT'.$rec_options.')'."\n\t"; |
|
81 | + $conf .= 'same => n,Hangup()'."\n\n"; |
|
82 | 82 | } |
83 | 83 | |
84 | 84 | return $conf; |
@@ -11,7 +11,7 @@ |
||
11 | 11 | class AGIDebug extends AGI { |
12 | 12 | private string $scriptName; |
13 | 13 | |
14 | - function __construct($scriptName){ |
|
14 | + function __construct($scriptName) { |
|
15 | 15 | $this->scriptName = $scriptName; |
16 | 16 | } |
17 | 17 |
@@ -8,10 +8,12 @@ |
||
8 | 8 | |
9 | 9 | namespace MikoPBX\Core\Asterisk; |
10 | 10 | |
11 | -class AGIDebug extends AGI { |
|
11 | +class AGIDebug extends AGI |
|
12 | +{ |
|
12 | 13 | private string $scriptName; |
13 | 14 | |
14 | - function __construct($scriptName){ |
|
15 | + function __construct($scriptName) |
|
16 | + { |
|
15 | 17 | $this->scriptName = $scriptName; |
16 | 18 | } |
17 | 19 |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | if (file_exists('/etc/TZ')) { |
175 | 175 | $origin_tz = file_get_contents("/etc/TZ"); |
176 | 176 | } |
177 | - if ($origin_tz !== $db_tz){ |
|
177 | + if ($origin_tz !== $db_tz) { |
|
178 | 178 | self::timezoneConfigure(); |
179 | 179 | } |
180 | 180 | $origin_tz = $db_tz; |
@@ -244,7 +244,7 @@ discard block |
||
244 | 244 | } |
245 | 245 | if ($timezone) { |
246 | 246 | $zone_file = "/usr/share/zoneinfo/{$timezone}"; |
247 | - if ( ! file_exists($zone_file)) { |
|
247 | + if (!file_exists($zone_file)) { |
|
248 | 248 | return; |
249 | 249 | } |
250 | 250 | $cpPath = Util::which('cp'); |