Bläddra i källkod

Misc: Remove parameters from event_socket_create() calls.

fusionate 2 år sedan
förälder
incheckning
21ea027bc4

+ 1 - 1
core/notifications/notification_edit.php

@@ -74,7 +74,7 @@ Mark J Crane <[email protected]>
 			$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');
 			}

+ 2 - 2
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);
 					}

+ 6 - 6
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;
 					}

+ 3 - 3
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 = "<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;
 			}

+ 1 - 1
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"] = '';