diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php index 6f4d3957d2..8d85f0d3f2 100644 --- a/app/access_controls/access_control_edit.php +++ b/app/access_controls/access_control_edit.php @@ -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"); } diff --git a/app/access_controls/access_controls_reload.php b/app/access_controls/access_controls_reload.php index 090e9235e3..df735ec949 100644 --- a/app/access_controls/access_controls_reload.php +++ b/app/access_controls/access_controls_reload.php @@ -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')); diff --git a/app/access_controls/resources/classes/access_controls.php b/app/access_controls/resources/classes/access_controls.php index 4a3f84cdd0..56e1508106 100644 --- a/app/access_controls/resources/classes/access_controls.php +++ b/app/access_controls/resources/classes/access_controls.php @@ -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"); } diff --git a/app/basic_operator_panel/exec.php b/app/basic_operator_panel/exec.php index f3165c5ba6..7d44f13f4d 100644 --- a/app/basic_operator_panel/exec.php +++ b/app/basic_operator_panel/exec.php @@ -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)) { diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php index 24cf2ef348..2fecd9f35f 100644 --- a/app/basic_operator_panel/index.php +++ b/app/basic_operator_panel/index.php @@ -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); } diff --git a/app/basic_operator_panel/resources/classes/basic_operator_panel.php b/app/basic_operator_panel/resources/classes/basic_operator_panel.php index 0340fbef68..a68627b831 100644 --- a/app/basic_operator_panel/resources/classes/basic_operator_panel.php +++ b/app/basic_operator_panel/resources/classes/basic_operator_panel.php @@ -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); diff --git a/app/basic_operator_panel/resources/content.php b/app/basic_operator_panel/resources/content.php index 9d909fae4c..d2d300b189 100644 --- a/app/basic_operator_panel/resources/content.php +++ b/app/basic_operator_panel/resources/content.php @@ -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']); diff --git a/app/call_broadcast/call_broadcast_send.php b/app/call_broadcast/call_broadcast_send.php index 759b6e8005..1280942453 100644 --- a/app/call_broadcast/call_broadcast_send.php +++ b/app/call_broadcast/call_broadcast_send.php @@ -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 diff --git a/app/call_broadcast/call_broadcast_stop.php b/app/call_broadcast/call_broadcast_stop.php index 4355a88235..e235eda429 100644 --- a/app/call_broadcast/call_broadcast_stop.php +++ b/app/call_broadcast/call_broadcast_stop.php @@ -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); diff --git a/app/call_center_active/call_center_active_inc.php b/app/call_center_active/call_center_active_inc.php index 485e8d2fd7..9729b40c72 100644 --- a/app/call_center_active/call_center_active_inc.php +++ b/app/call_center_active/call_center_active_inc.php @@ -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) { diff --git a/app/call_center_active/call_center_exec.php b/app/call_center_active/call_center_exec.php index 45b40dbfba..cbe5e5c189 100644 --- a/app/call_center_active/call_center_exec.php +++ b/app/call_center_active/call_center_exec.php @@ -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 diff --git a/app/call_centers/call_center_agent_edit.php b/app/call_centers/call_center_agent_edit.php index 288447e9c7..fba293e2e8 100644 --- a/app/call_centers/call_center_agent_edit.php +++ b/app/call_centers/call_center_agent_edit.php @@ -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 diff --git a/app/call_centers/call_center_agent_status.php b/app/call_centers/call_center_agent_status.php index 1f58c83e21..6d35c09d21 100644 --- a/app/call_centers/call_center_agent_status.php +++ b/app/call_centers/call_center_agent_status.php @@ -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 "; diff --git a/app/call_centers/call_center_queue_edit.php b/app/call_centers/call_center_queue_edit.php index d83459e840..b70bda5dae 100644 --- a/app/call_centers/call_center_queue_edit.php +++ b/app/call_centers/call_center_queue_edit.php @@ -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: diff --git a/app/call_centers/cmd.php b/app/call_centers/cmd.php index fe00fb9815..1c3fa73ca6 100644 --- a/app/call_centers/cmd.php +++ b/app/call_centers/cmd.php @@ -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"]); diff --git a/app/call_centers/resources/classes/call_center.php b/app/call_centers/resources/classes/call_center.php index c1f019c1d2..827adc9430 100644 --- a/app/call_centers/resources/classes/call_center.php +++ b/app/call_centers/resources/classes/call_center.php @@ -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) { diff --git a/app/call_centers/resources/dashboard/call_center_agents.php b/app/call_centers/resources/dashboard/call_center_agents.php index c3e093cf99..96238855d6 100644 --- a/app/call_centers/resources/dashboard/call_center_agents.php +++ b/app/call_centers/resources/dashboard/call_center_agents.php @@ -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) { diff --git a/app/call_centers/resources/jobs/call_center_agents.php b/app/call_centers/resources/jobs/call_center_agents.php index 2d17aabbfb..29f3aca9cb 100644 --- a/app/call_centers/resources/jobs/call_center_agents.php +++ b/app/call_centers/resources/jobs/call_center_agents.php @@ -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'; diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index f31a57dbcd..a29e31c550 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -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"; diff --git a/app/call_flows/resources/classes/call_flows.php b/app/call_flows/resources/classes/call_flows.php index fb9755ae33..264d7759ce 100644 --- a/app/call_flows/resources/classes/call_flows.php +++ b/app/call_flows/resources/classes/call_flows.php @@ -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); } } diff --git a/app/call_forward/call_forward_edit.php b/app/call_forward/call_forward_edit.php index a1faa43059..20cbd4d715 100644 --- a/app/call_forward/call_forward_edit.php +++ b/app/call_forward/call_forward_edit.php @@ -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); } diff --git a/app/call_forward/resources/classes/do_not_disturb.php b/app/call_forward/resources/classes/do_not_disturb.php index 7a6996d8b8..94226edca7 100644 --- a/app/call_forward/resources/classes/do_not_disturb.php +++ b/app/call_forward/resources/classes/do_not_disturb.php @@ -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); diff --git a/app/call_forward/resources/classes/feature_event_notify.php b/app/call_forward/resources/classes/feature_event_notify.php index 936a12b803..ec0afa5a0f 100644 --- a/app/call_forward/resources/classes/feature_event_notify.php +++ b/app/call_forward/resources/classes/feature_event_notify.php @@ -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}"; diff --git a/app/call_forward/resources/jobs/dnd.php b/app/call_forward/resources/jobs/dnd.php index 150a54456b..98f6b8aea6 100644 --- a/app/call_forward/resources/jobs/dnd.php +++ b/app/call_forward/resources/jobs/dnd.php @@ -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 "; diff --git a/app/calls_active/calls_active_inc.php b/app/calls_active/calls_active_inc.php index 00a7c20b31..abfabe5408 100644 --- a/app/calls_active/calls_active_inc.php +++ b/app/calls_active/calls_active_inc.php @@ -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) { diff --git a/app/calls_active/calls_exec.php b/app/calls_active/calls_exec.php index 628b297053..652e4393f4 100644 --- a/app/calls_active/calls_exec.php +++ b/app/calls_active/calls_exec.php @@ -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) { diff --git a/app/click_to_call/click_to_call.php b/app/click_to_call/click_to_call.php index b9707ca71f..f612424072 100644 --- a/app/click_to_call/click_to_call.php +++ b/app/click_to_call/click_to_call.php @@ -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 "
Connection to Event Socket failed.
"; @@ -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 "
Connection to Event Socket failed.
"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 459a15a70f..649aeb8746 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -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); } diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index 09b748569e..f00c4829c5 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -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 } diff --git a/app/conference_centers/resources/classes/call_center_notify.php b/app/conference_centers/resources/classes/call_center_notify.php index 2923c407ad..944f6bbd91 100644 --- a/app/conference_centers/resources/classes/call_center_notify.php +++ b/app/conference_centers/resources/classes/call_center_notify.php @@ -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"; diff --git a/app/conference_centers/resources/classes/conference_centers.php b/app/conference_centers/resources/classes/conference_centers.php index cdf3fb8110..71a3abde23 100644 --- a/app/conference_centers/resources/classes/conference_centers.php +++ b/app/conference_centers/resources/classes/conference_centers.php @@ -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); diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php index 3ec5556fcc..721bc0d53b 100644 --- a/app/conferences_active/conference_exec.php +++ b/app/conferences_active/conference_exec.php @@ -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 diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index 594d354b17..075e3ccef8 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.php @@ -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 = "
".$text['message-connection']."
"; echo "
\n"; diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index 7089bd1f19..3d9be0d290 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -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 = "
".$text['message-connection']."
"; echo "
\n"; diff --git a/app/devices/cmd.php b/app/devices/cmd.php index 10ddd0fcc4..64bc0f37f8 100644 --- a/app/devices/cmd.php +++ b/app/devices/cmd.php @@ -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}"; diff --git a/app/dialplans/dialplan_edit.php b/app/dialplans/dialplan_edit.php index 4bea6d84e4..9295fde175 100644 --- a/app/dialplans/dialplan_edit.php +++ b/app/dialplans/dialplan_edit.php @@ -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'); diff --git a/app/email_queue/resources/jobs/email_send.php b/app/email_queue/resources/jobs/email_send.php index 3425d4ff2e..a78b9ba697 100644 --- a/app/email_queue/resources/jobs/email_send.php +++ b/app/email_queue/resources/jobs/email_send.php @@ -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"; diff --git a/app/event_guard/resources/classes/event_guard.php b/app/event_guard/resources/classes/event_guard.php index 1ce290e1e9..5f0dd3a43c 100644 --- a/app/event_guard/resources/classes/event_guard.php +++ b/app/event_guard/resources/classes/event_guard.php @@ -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 diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index ef1e336100..8b9c2c9f56 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -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"); } } diff --git a/app/fax/fax_outbox.php b/app/fax/fax_outbox.php index bf7d7a7054..656d839c50 100644 --- a/app/fax/fax_outbox.php +++ b/app/fax/fax_outbox.php @@ -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) { diff --git a/app/fax_queue/resources/job/fax_send.php b/app/fax_queue/resources/job/fax_send.php index 42bc63d78b..9c3c3364ba 100644 --- a/app/fax_queue/resources/job/fax_send.php +++ b/app/fax_queue/resources/job/fax_send.php @@ -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; diff --git a/app/fifo_list/fifo_exec.php b/app/fifo_list/fifo_exec.php index d84c6b501f..6d9fd3c544 100644 --- a/app/fifo_list/fifo_exec.php +++ b/app/fifo_list/fifo_exec.php @@ -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); diff --git a/app/fifo_list/fifo_interactive_inc.php b/app/fifo_list/fifo_interactive_inc.php index d652c8146e..eb226ca787 100644 --- a/app/fifo_list/fifo_interactive_inc.php +++ b/app/fifo_list/fifo_interactive_inc.php @@ -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 = "
Connection to Event Socket failed.
"; echo "
\n"; diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php index f4b2a3935e..541afa9304 100644 --- a/app/fifo_list/fifo_list_inc.php +++ b/app/fifo_list/fifo_list_inc.php @@ -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 { diff --git a/app/gateways/gateway_copy.php b/app/gateways/gateway_copy.php index 5e69b56872..f3a542b761 100644 --- a/app/gateways/gateway_copy.php +++ b/app/gateways/gateway_copy.php @@ -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); diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index f56b77bfae..affe3d9c9d 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -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); diff --git a/app/gateways/resources/classes/gateways.php b/app/gateways/resources/classes/gateways.php index 49723622b7..cd89c5bedb 100644 --- a/app/gateways/resources/classes/gateways.php +++ b/app/gateways/resources/classes/gateways.php @@ -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); diff --git a/app/modules/modules.php b/app/modules/modules.php index 01d6a5b3d0..defb1c891a 100644 --- a/app/modules/modules.php +++ b/app/modules/modules.php @@ -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; diff --git a/app/modules/resources/classes/modules.php b/app/modules/resources/classes/modules.php index 293cfce1b4..114e00afdd 100644 --- a/app/modules/resources/classes/modules.php +++ b/app/modules/resources/classes/modules.php @@ -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) { diff --git a/app/music_on_hold/resources/classes/switch_music_on_hold.php b/app/music_on_hold/resources/classes/switch_music_on_hold.php index 0a2a348488..a83b4d60ce 100644 --- a/app/music_on_hold/resources/classes/switch_music_on_hold.php +++ b/app/music_on_hold/resources/classes/switch_music_on_hold.php @@ -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 = "
".$text['message-event-socket']."
"; diff --git a/app/number_translations/cmd.php b/app/number_translations/cmd.php index ddb1f45a67..e550cfbfd7 100644 --- a/app/number_translations/cmd.php +++ b/app/number_translations/cmd.php @@ -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") { diff --git a/app/sip_profiles/resources/classes/sip_profiles.php b/app/sip_profiles/resources/classes/sip_profiles.php index 01d5ea91d2..8867c47e72 100644 --- a/app/sip_profiles/resources/classes/sip_profiles.php +++ b/app/sip_profiles/resources/classes/sip_profiles.php @@ -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'); } diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php index 8f95399b60..aa6bfd01d9 100644 --- a/app/sip_profiles/sip_profile_edit.php +++ b/app/sip_profiles/sip_profile_edit.php @@ -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'); } diff --git a/app/sip_status/cmd.php b/app/sip_status/cmd.php index 1b4f9e469f..f11202527e 100644 --- a/app/sip_status/cmd.php +++ b/app/sip_status/cmd.php @@ -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)) { diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php index d261013ab2..92b30dc2cd 100644 --- a/app/sip_status/sip_status.php +++ b/app/sip_status/sip_status.php @@ -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); } diff --git a/app/switch/resources/classes/presence.php b/app/switch/resources/classes/presence.php index b79755fac2..22f40979ac 100644 --- a/app/switch/resources/classes/presence.php +++ b/app/switch/resources/classes/presence.php @@ -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); diff --git a/app/voicemails/resources/classes/voicemail.php b/app/voicemails/resources/classes/voicemail.php index 67f10c5163..00c3c87374 100644 --- a/app/voicemails/resources/classes/voicemail.php +++ b/app/voicemails/resources/classes/voicemail.php @@ -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); diff --git a/core/notifications/notification_edit.php b/core/notifications/notification_edit.php index 52341a9001..04da78c647 100644 --- a/core/notifications/notification_edit.php +++ b/core/notifications/notification_edit.php @@ -74,7 +74,7 @@ Mark J Crane $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'); } diff --git a/core/users/user_edit.php b/core/users/user_edit.php index 792da2b9c9..577f31c4f9 100644 --- a/core/users/user_edit.php +++ b/core/users/user_edit.php @@ -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); } diff --git a/resources/classes/cache.php b/resources/classes/cache.php index d961540348..5e6ff0a654 100644 --- a/resources/classes/cache.php +++ b/resources/classes/cache.php @@ -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; } diff --git a/resources/functions.php b/resources/functions.php index ce0e2cb934..6a4ab4288a 100644 --- a/resources/functions.php +++ b/resources/functions.php @@ -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 = "
Connection to Event Socket failed.
"; @@ -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; } diff --git a/resources/header.php b/resources/header.php index 11fa8f3a65..5e21ac3df0 100644 --- a/resources/header.php +++ b/resources/header.php @@ -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"] = '';