nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Misc: Remove parameters from event_socket_create() calls.

Browse Source
This commit is contained in:
fusionate
2023-09-20 18:43:17 +00:00
parent 8ee8e30b31
commit d9d17a6917
62 changed files with 95 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/access_controls/access_control_edit.php
View File

@@ -118,7 +118,7 @@
$cache->delete("configuration:acl.conf");
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
event_socket_request($fp, "api reloadacl");
}
@@ -204,7 +204,7 @@
$cache->delete("configuration:acl.conf");
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
event_socket_request($fp, "api reloadacl");
}

2
app/access_controls/access_controls_reload.php
View File

@@ -41,7 +41,7 @@
$search = $_REQUEST['search'] ?? '';
//create event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//run the command
$result = rtrim(event_socket_request($fp, 'api reloadacl'));

6
app/access_controls/resources/classes/access_controls.php
View File

@@ -87,7 +87,7 @@ if (!class_exists('access_controls')) {
$cache->delete("configuration:acl.conf");
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
event_socket_request($fp, "api reloadacl");
}
@@ -146,7 +146,7 @@ if (!class_exists('access_controls')) {
$cache->delete("configuration:acl.conf");
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
event_socket_request($fp, "api reloadacl");
}
@@ -261,7 +261,7 @@ if (!class_exists('access_controls')) {
$cache->delete("configuration:acl.conf");
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
event_socket_request($fp, "api reloadacl");
}

2
app/basic_operator_panel/exec.php
View File

@@ -57,7 +57,7 @@ if (count($_GET) > 0) {
$direction = trim($_GET["direction"] ?? '');
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//allow specific commands
if (!empty($switch_cmd)) {

2
app/basic_operator_panel/index.php
View File

@@ -97,7 +97,7 @@
//update the user_status
if (is_uuid($call_center_agent_uuid)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$switch_cmd .= "callcenter_config agent set status ".$call_center_agent_uuid." '".$user_status."'";
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}

2
app/basic_operator_panel/resources/classes/basic_operator_panel.php
View File

@@ -86,7 +86,7 @@ if (!class_exists('basic_operator_panel')) {
}
//send the command
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$switch_result = event_socket_request($fp, 'api show channels as json');
$json_array = json_decode($switch_result, true);

2
app/basic_operator_panel/resources/content.php
View File

@@ -64,7 +64,7 @@ if (!empty($groups)) {
}
//get the valet info
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$valet_info = event_socket_request($fp, 'api valet_info park@'.$_SESSION['domain_name']);

4
app/call_broadcast/call_broadcast_send.php
View File

@@ -130,7 +130,7 @@
$broadcast_name = str_replace("'", "", $broadcast_name);
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//get information over event socket
if (!$fp) {
@@ -196,7 +196,7 @@
//if the event socket connection is lost then re-connect
if (!$fp) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
}
//method 1

2
app/call_broadcast/call_broadcast_stop.php
View File

@@ -45,7 +45,7 @@ else {
if (is_uuid($uuid)) {
//show the result
if (count($_GET) > 0) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$cmd = "sched_del ".$uuid;
$result = event_socket_request($fp, 'api '.$cmd);

2
app/call_center_active/call_center_active_inc.php
View File

@@ -90,7 +90,7 @@
}
//create an event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//get the call center queue, agent and tiers list
if (!$fp) {

4
app/call_center_active/call_center_exec.php
View File

@@ -90,7 +90,7 @@
//run the command
if (isset($switch_command)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$response = event_socket_request($fp, 'api '.$switch_command);
}
@@ -134,7 +134,7 @@
//fs cmd
if (!empty($switch_cmd)) {
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//ensure the connection exists
if ($fp) {
//send the command

2
app/call_centers/call_center_agent_edit.php
View File

@@ -238,7 +238,7 @@
//add the agent
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//add the agent using event socket
if ($fp) {
//add the agent

2
app/call_centers/call_center_agent_status.php
View File

@@ -57,7 +57,7 @@
unset($sql, $parameters);
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//get the agents from the database
$sql = "select * from v_call_center_agents ";

4
app/call_centers/call_center_queue_edit.php
View File

@@ -152,7 +152,7 @@
//delete the agent from freeswitch
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//delete the agent over event socket
if ($fp) {
//callcenter_config tier del [queue_name] [agent_name]
@@ -457,7 +457,7 @@
if (!empty($agent_name)) {
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//add the agent using event socket
if ($fp) {
/* syntax:

2
app/call_centers/cmd.php
View File

@@ -70,7 +70,7 @@
//connect to event socket
if (isset($queue_extension) && isset($cmd)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$response = event_socket_request($fp, 'api reloadxml');
$response = event_socket_request($fp, 'api callcenter_config queue '.$cmd. ' '.$queue_extension."@".$_SESSION["domain_name"]);

4
app/call_centers/resources/classes/call_center.php
View File

@@ -338,7 +338,7 @@
if (is_array($array) && @sizeof($array) != 0) {
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//delete the queue in the switch
if ($fp) {
@@ -436,7 +436,7 @@
if (is_array($array) && @sizeof($array) != 0) {
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//delete the agent in the switch
if ($fp) {

2
app/call_centers/resources/dashboard/call_center_agents.php
View File

@@ -51,7 +51,7 @@
}
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//get the http post values and set them as php variables
if (count($_POST) > 0) {

2
app/call_centers/resources/jobs/call_center_agents.php
View File

@@ -31,7 +31,7 @@
}
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//get the agent list from event socket
$switch_cmd = 'callcenter_config agent list';

2
app/call_flows/call_flow_edit.php
View File

@@ -254,7 +254,7 @@
$p->delete("dialplan_edit", "temp");
// Update subscribed endpoints
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//send the event
$event = "sendevent PRESENCE_IN\n";

2
app/call_flows/resources/classes/call_flows.php
View File

@@ -281,7 +281,7 @@ if (!class_exists('call_flows')) {
}
//send the event
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$switch_result = event_socket_request($fp, $cmd);
}
}

4
app/call_forward/call_forward_edit.php
View File

@@ -399,7 +399,7 @@
$cmd .= "answer-state: confirmed\n";
//send the event
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$switch_result = event_socket_request($fp, $cmd);
unset($fp);
}
@@ -421,7 +421,7 @@
$cmd .= "answer-state: terminated\n";
//send the event
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$switch_result = event_socket_request($fp, $cmd);
unset($fp);
}

2
app/call_forward/resources/classes/do_not_disturb.php
View File

@@ -39,7 +39,7 @@
if ($this->enabled == "true") {
//update the call center status
$user_status = "Logged Out";
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$switch_cmd .= "callcenter_config agent set status ".$_SESSION['username']."@".$this->domain_name." '".$user_status."'";
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);

2
app/call_forward/resources/classes/feature_event_notify.php
View File

@@ -42,7 +42,7 @@
//feature_event method
public function send_notify() {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
// Get the SIP profiles for the extension
$command = "sofia_contact */{$this->extension}@{$this->domain_name}";

2
app/call_forward/resources/jobs/dnd.php
View File

@@ -32,7 +32,7 @@
}
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//get the list
$sql = "select domain_name, extension, user_context, do_not_disturb, description ";

2
app/calls_active/calls_active_inc.php
View File

@@ -52,7 +52,7 @@
$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']);
$fp = event_socket_create();
//send the event socket command and get the array
if ($fp) {

2
app/calls_active/calls_exec.php
View File

@@ -74,7 +74,7 @@
if (is_array($calls) && @sizeof($calls) != 0) {
//setup the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//execute hangup command
foreach ($calls as $call_uuid) {

4
app/click_to_call/click_to_call.php
View File

@@ -93,7 +93,7 @@
}
//create the even socket connection and send the event socket command
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
//error message
echo "<div align='center'><strong>Connection to Event Socket failed.</strong></div>";
@@ -200,7 +200,7 @@
unset($destination_common);
//create the even socket connection and send the event socket command
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
//error message
echo "<div align='center'><strong>Connection to Event Socket failed.</strong></div>";

2
app/conference_centers/conference_room_edit.php
View File

@@ -141,7 +141,7 @@
$default_voice = 'callie';
$switch_cmd = "conference ".$conference_room_uuid."@".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}

4
app/conference_centers/conference_rooms.php
View File

@@ -98,7 +98,7 @@
$default_voice = 'callie';
$switch_cmd = "conference ".$meeting_uuid."@".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
@@ -137,7 +137,7 @@
//get conference array
$switch_cmd = "conference xml_list";
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
//connection to even socket failed
}

2
app/conference_centers/resources/classes/call_center_notify.php
View File

@@ -37,7 +37,7 @@
//feature_event method
public function send_call_center_notify() {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//send the event
$event = "sendevent PRESENCE_IN\n";

2
app/conference_centers/resources/classes/conference_centers.php
View File

@@ -687,7 +687,7 @@ if (!class_exists('conference_centers')) {
$switch_cmd_notice = "conference ".$meeting_uuid[$uuid]."@".$_SESSION['domain_name']." play ".$_SESSION['switch']['sounds']['dir']."/".$default_language."/".$default_dialect."/".$default_voice."/ivr/ivr-recording_started.wav";
//execute api commands
// if (!file_exists($recording_dir.'/'.$meeting_uuid[$uuid].'.wav')) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
// $switch_result = event_socket_request($fp, 'api '.$switch_cmd_record);
$switch_result = event_socket_request($fp, 'api '.$switch_cmd_notice);

2
app/conferences_active/conference_exec.php
View File

@@ -188,7 +188,7 @@
}
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
if ($data == "energy") {
//conference 3001-example-domain.org energy 103

2
app/conferences_active/conference_interactive_inc.php
View File

@@ -61,7 +61,7 @@
$switch_cmd = "conference '".$conference_name."' xml_list";
//connect to event socket, send the command and process the results
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
$msg = "<div align='center'>".$text['message-connection']."<br /></div>";
echo "<div align='center'>\n";

2
app/conferences_active/conferences_active_inc.php
View File

@@ -43,7 +43,7 @@
$text = $language->get();
//show content
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
$msg = "<div align='center'>".$text['message-connection']."<br /></div>";
echo "<div align='center'>\n";

2
app/devices/cmd.php
View File

@@ -65,7 +65,7 @@
}
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
// Get the SIP profiles for the user
$command = "sofia_contact */{$user}@{$domain_name}";

2
app/dialplans/dialplan_edit.php
View File

@@ -89,7 +89,7 @@ javascript:void(0);
//get the list of applications
if (empty($_SESSION['switch']['applications']) || !is_array($_SESSION['switch']['applications'])) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$result = event_socket_request($fp, 'api show application');

6
app/email_queue/resources/jobs/email_send.php
View File

@@ -383,11 +383,7 @@
$domain_name = $database->select($sql, $parameters, 'column');
//send the message waiting status
$fp = event_socket_create(
$setting->get('switch','event_socket_ip_address'),
$setting->get('switch', 'event_socket_port'),
$setting->get('switch', 'event_socket_password')
);
$fp = event_socket_create();
if ($fp) {
//$switch_cmd .= "luarun app.lua voicemail mwi ".$voicemail_id."@".$domain_name;
$switch_cmd .= "luarun app/voicemail/resources/scripts/mwi_notify.lua ".$voicemail_id." ".$domain_name." 0 0";

2
app/event_guard/resources/classes/event_guard.php
View File

@@ -157,7 +157,7 @@ if (!class_exists('event_guard')) {
$cmd = "sendevent CUSTOM\n";
$cmd .= "Event-Name: CUSTOM\n";
$cmd .= "Event-Subclass: event_guard:unblock\n";
$fp = event_socket_create($setting->get('switch','event_socket_ip_address'), $setting->get('switch', 'event_socket_port'), $setting->get('switch', 'event_socket_password'));
$fp = event_socket_create();
$switch_result = event_socket_request($fp, $cmd);
//set message

2
app/extensions/extension_edit.php
View File

@@ -780,7 +780,7 @@
//reload acl if allowed
if (permission_exists("extension_cidr")) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) { event_socket_request($fp, "api reloadacl"); }
}

2
app/fax/fax_outbox.php
View File

@@ -98,7 +98,7 @@
$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']);
$fp = event_socket_create();
//send the event socket command and get the array
if ($fp) {

2
app/fax_queue/resources/job/fax_send.php
View File

@@ -225,7 +225,7 @@
if ($fax_status == 'waiting' || $fax_status == 'trying' || $fax_status == 'busy') {
//create event socket handle
$fp = event_socket_create($setting->get('switch','event_socket_ip_address'), $setting->get('switch','event_socket_port'), $setting->get('switch','event_socket_password'));
$fp = event_socket_create();
if (!$fp) {
echo "Could not connect to event socket.\n";
exit;

2
app/fifo_list/fifo_exec.php
View File

@@ -79,7 +79,7 @@
}
*/
//connect to the event socket
//$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
//$fp = event_socket_create();
//send the command over event socket
//if ($fp) {
// $switch_result = event_socket_request($fp, 'api '.$switch_cmd);

2
app/fifo_list/fifo_interactive_inc.php
View File

@@ -57,7 +57,7 @@
$switch_cmd = 'fifo list_verbose '.$fifo_name.'';
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
$msg = "<div align='center'>Connection to Event Socket failed.<br /></div>";
echo "<div align='center'>\n";

2
app/fifo_list/fifo_list_inc.php
View File

@@ -46,7 +46,7 @@
//show the list
$switch_cmd = 'fifo list';
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$xml_str = trim(event_socket_request($fp, 'api '.$switch_cmd));
try {

2
app/gateways/gateway_copy.php
View File

@@ -143,7 +143,7 @@
save_gateway_xml();
//clear the cache
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$hostname = trim(event_socket_request($fp, 'api switchname'));
$cache = new cache;
$cache->delete("configuration:sofia.conf:".$hostname);

4
app/gateways/gateway_edit.php
View File

@@ -227,14 +227,14 @@
save_gateway_xml();
//clear the cache
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$hostname = trim(event_socket_request($fp, 'api switchname'));
$cache = new cache;
$cache->delete("configuration:sofia.conf:".$hostname);
//rescan the external profile to look for new or stopped gateways
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$tmp_cmd = 'api sofia profile external rescan';
$response = event_socket_request($fp, $tmp_cmd);
unset($tmp_cmd);

16
app/gateways/resources/classes/gateways.php
View File

@@ -110,7 +110,7 @@ if (!class_exists('gateways')) {
if (!empty($gateways) && is_array($gateways) && @sizeof($gateways) != 0) {
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//start gateways
foreach ($gateways as $gateway_uuid => $gateway) {
@@ -198,7 +198,7 @@ if (!class_exists('gateways')) {
if (!empty($gateways) && is_array($gateways) && @sizeof($gateways) != 0) {
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//stop gateways
foreach ($gateways as $gateway_uuid => $gateway) {
@@ -275,7 +275,7 @@ if (!class_exists('gateways')) {
//create the event socket connection
if (!isset($fp)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
}
//loop through gateways
@@ -321,7 +321,7 @@ if (!class_exists('gateways')) {
//clear the cache
if (!$fp) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
}
if ($fp) {
$hostname = trim(event_socket_request($fp, 'api switchname'));
@@ -331,7 +331,7 @@ if (!class_exists('gateways')) {
//rescan the sip profile to look for new or stopped gateways
if (!$fp) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
}
if ($fp) {
//get distinct profiles from gateways
@@ -452,14 +452,14 @@ if (!class_exists('gateways')) {
save_gateway_xml();
//clear the cache
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$hostname = trim(event_socket_request($fp, 'api switchname'));
$cache = new cache;
$cache->delete("configuration:sofia.conf:".$hostname);
//create the event socket connection
if (!$fp) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
}
//rescan the sip profile to look for new or stopped gateways
@@ -585,7 +585,7 @@ if (!class_exists('gateways')) {
save_gateway_xml();
//clear the cache
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$hostname = trim(event_socket_request($fp, 'api switchname'));
$cache = new cache;
$cache->delete("configuration:sofia.conf:".$hostname);

2
app/modules/modules.php
View File

@@ -92,7 +92,7 @@
}
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//check connection status
$esl_alive = false;

8
app/modules/resources/classes/modules.php
View File

@@ -682,7 +682,7 @@ if (!class_exists('modules')) {
//check the status of the module
public function active($name) {
if (!$this->fp) {
$this->fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$this->fp = event_socket_create();
}
if ($this->fp) {
$cmd = "api module_exists ".$name;
@@ -883,7 +883,7 @@ if (!class_exists('modules')) {
if (is_array($modules) && @sizeof($modules) != 0) {
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//control modules
@@ -969,7 +969,7 @@ if (!class_exists('modules')) {
if (is_array($array) && @sizeof($array) != 0) {
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//stop modules
if ($fp) {
@@ -1069,7 +1069,7 @@ if (!class_exists('modules')) {
unset($array);
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//stop modules if active
if ($fp) {

2
app/music_on_hold/resources/classes/switch_music_on_hold.php
View File

@@ -147,7 +147,7 @@ if (!class_exists('switch_music_on_hold')) {
public function reload() {
//if the handle does not exist create it
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//if the handle still does not exist show an error message
if (!$fp) {
$msg = "<div align='center'>".$text['message-event-socket']."<br /></div>";

2
app/number_translations/cmd.php
View File

@@ -42,7 +42,7 @@
$rdr = $_GET['rdr'];
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//reloadxml
if ($cmd == "api reloadxml") {

8
app/sip_profiles/resources/classes/sip_profiles.php
View File

@@ -154,7 +154,7 @@ if (!class_exists('sip_profiles')) {
}
}
if ($empty_hostname) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$hostnames[] = event_socket_request($fp, 'api switchname');
}
@@ -237,7 +237,7 @@ if (!class_exists('sip_profiles')) {
//get system hostname if necessary
if (empty($sip_profile_hostname)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$sip_profile_hostname = event_socket_request($fp, 'api switchname');
}
@@ -315,7 +315,7 @@ if (!class_exists('sip_profiles')) {
//get system hostname if necessary
if (empty($sip_profile_hostname)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$sip_profile_hostname = event_socket_request($fp, 'api switchname');
}
@@ -403,7 +403,7 @@ if (!class_exists('sip_profiles')) {
}
}
if ($empty_hostname) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$hostnames[] = event_socket_request($fp, 'api switchname');
}

2
app/sip_profiles/sip_profile_edit.php
View File

@@ -247,7 +247,7 @@
//get the hostname
if ($sip_profile_hostname == '') {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$sip_profile_hostname = event_socket_request($fp, 'api switchname');
}

2
app/sip_status/cmd.php
View File

@@ -91,7 +91,7 @@
}
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
//if reloadxml then run reloadacl, reloadxml and rescan the external profile for new gateways
if (isset($command)) {

3
app/sip_status/sip_status.php
View File

@@ -43,8 +43,7 @@
$text = $language->get();
//create event socket
$socket_ip = $_SESSION['event_socket_ip_address'] != '0.0.0.0' ? $_SESSION['event_socket_ip_address'] : '127.0.0.1';
$fp = event_socket_create($socket_ip, $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
message::add($text['error-event-socket'], 'negative', 5000);
}

4
app/switch/resources/classes/presence.php
View File

@@ -36,7 +36,7 @@ if (!class_exists('presence')) {
* @var string $presence_id
*/
public function active($presence_id) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$cmd = 'show calls as json';
$json = event_socket_request($fp, 'api '.$cmd);
unset($fp);
@@ -65,7 +65,7 @@ if (!class_exists('presence')) {
* show presence
*/
public function show() {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$cmd = 'show calls as json';
$json = event_socket_request($fp, 'api '.$cmd);
unset($fp);

2
app/voicemails/resources/classes/voicemail.php
View File

@@ -595,7 +595,7 @@
//send the message waiting status
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$switch_cmd = "luarun app.lua voicemail mwi ".$this->voicemail_id."@".$_SESSION['domain_name'];
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);

2
core/notifications/notification_edit.php
View File

@@ -74,7 +74,7 @@ Mark J Crane <markjcrane@fusionpbx.com>
$web_server = $_SERVER['SERVER_SOFTWARE'];
// switch version
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp) {
$switch_result = event_socket_request($fp, 'api version');
}

4
core/users/user_edit.php
View File

@@ -573,14 +573,14 @@
//update the user_status
if (isset($call_center_agent_uuid) && is_uuid($call_center_agent_uuid) && !empty($user_status)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$switch_cmd = "callcenter_config agent set status ".$call_center_agent_uuid." '".$user_status."'";
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
//update the user state
if (isset($call_center_agent_uuid) && is_uuid($call_center_agent_uuid)) {
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
$cmd = "api callcenter_config agent set state ".$call_center_agent_uuid." Waiting";
$response = event_socket_request($fp, $cmd);
}

12
resources/classes/cache.php
View File

@@ -30,7 +30,7 @@ class cache {
//save to memcache
if ($_SESSION['cache']['method']['text'] == "memcache") {
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp === false) {
return false;
}
@@ -64,7 +64,7 @@ class cache {
//cache method memcache
if ($_SESSION['cache']['method']['text'] == "memcache") {
// connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp === false) {
return false;
}
@@ -106,7 +106,7 @@ class cache {
//cache method memcache
if (!empty($_SESSION['cache']['method']['text']) && $_SESSION['cache']['method']['text'] == "memcache") {
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp === false) {
return false;
}
@@ -133,7 +133,7 @@ class cache {
$key = str_replace(":", ".", $key);
//connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp === false) {
return false;
}
@@ -174,7 +174,7 @@ class cache {
//cache method memcache
if ($_SESSION['cache']['method']['text'] == "memcache") {
// connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp === false) {
return false;
}
@@ -198,7 +198,7 @@ class cache {
//cache method file
if ($_SESSION['cache']['method']['text'] == "file") {
// connect to event socket
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if ($fp === false) {
return false;
}

6
resources/functions.php
View File

@@ -715,7 +715,7 @@
function switch_module_is_running($fp, $mod) {
if (!$fp) {
//if the handle does not exist create it
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//if the handle still does not exist show an error message
if (!$fp) {
$msg = "<div align='center'>Connection to Event Socket failed.<br /></div>";
@@ -1859,7 +1859,7 @@ function number_pad($number,$n) {
//make directory with event socket
function event_socket_mkdir($dir) {
//connect to fs
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
return false;
}
@@ -2169,7 +2169,7 @@ function number_pad($number,$n) {
if (!function_exists('user_exists')) {
function user_exists($login, $domain_name = null) {
//connect to freeswitch
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
if (!$fp) {
return false;
}

2
resources/header.php
View File

@@ -35,7 +35,7 @@
}
else {
//create the event socket connection
$fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']);
$fp = event_socket_create();
//reload the access control list this also runs reloadxml
$response = event_socket_request($fp, 'api reloadxml');
$_SESSION["reload_xml"] = '';