mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Event socket bug fix and more docs (#6823)
* Add documentation to methods. Use is_resource for added type detection * Allow connect to specify timeout in microseconds with default 30,000 * Update calling mechanism for event sockets * Update project for new singleton event sockets * remove unused variable * catch errors on closing the socket
This commit is contained in:
@@ -52,11 +52,11 @@
|
||||
$switch_cmd = 'show channels as json';
|
||||
|
||||
//create the event socket connection
|
||||
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
|
||||
$esl = event_socket::create();
|
||||
|
||||
//send the event socket command and get the array
|
||||
if ($fp) {
|
||||
$json = trim(event_socket_request($fp, 'api '.$switch_cmd));
|
||||
if ($esl->is_connected()) {
|
||||
$json = trim(event_socket::api($switch_cmd));
|
||||
$results = json_decode($json, "true");
|
||||
}
|
||||
|
||||
@@ -90,7 +90,7 @@
|
||||
|
||||
|
||||
//if the connnection is available then run it and return the results
|
||||
if (!$fp) {
|
||||
if (!$esl) {
|
||||
|
||||
$msg = "<div align='center'>".$text['confirm-socket']."<br /></div>";
|
||||
echo "<div align='center'>\n";
|
||||
|
||||
@@ -58,6 +58,7 @@
|
||||
exit;
|
||||
}
|
||||
|
||||
$calls = [];
|
||||
//verify submitted call uuids
|
||||
if (is_array($_POST['calls']) && @sizeof($_POST['calls']) != 0) {
|
||||
foreach ($_POST['calls'] as $call) {
|
||||
@@ -71,18 +72,18 @@
|
||||
}
|
||||
|
||||
//iterate through calls
|
||||
if (is_array($calls) && @sizeof($calls) != 0) {
|
||||
if (count($calls) > 0) {
|
||||
|
||||
//setup the event socket connection
|
||||
$fp = event_socket_create();
|
||||
$esl = event_socket::create();
|
||||
|
||||
//execute hangup command
|
||||
foreach ($calls as $call_uuid) {
|
||||
$switch_result = event_socket_request($fp, 'api uuid_kill '.$call_uuid);
|
||||
if ($esl->is_connected()) foreach ($calls as $call_uuid) {
|
||||
event_socket::async("uuid_kill $call_uuid");
|
||||
}
|
||||
|
||||
//set message
|
||||
message::add($text['message-calls_ended'].': '.@sizeof($calls),'positive');
|
||||
message::add($text['message-calls_ended'].': '.count($calls),'positive');
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user