From 51ea37ed18f4373ca494ab473bcc7e278353997c Mon Sep 17 00:00:00 2001
From: markjcrane <markjcrane@gmail.com>
Date: Sat, 2 Apr 2016 19:23:16 -0600
Subject: [PATCH] Rename the EventSocket class.

---
 app/fax/fax_send.php                              | 2 +-
 core/install/resources/classes/detect_switch.php  | 6 +++---
 core/install/resources/classes/install_switch.php | 2 +-
 resources/classes/EventSocket.php                 | 9 ++++-----
 resources/switch.php                              | 6 +++---
 secure/fax_to_email.php                           | 2 +-
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php
index 7ba61f42c6..0d02cbde82 100644
--- a/app/fax/fax_send.php
+++ b/app/fax/fax_send.php
@@ -111,7 +111,7 @@ if (!$included) {
 		$fax_cover_font = $_SESSION['fax']['cover_font']['text'];
 }
 else{
-	require_once "resources/classes/EventSocket.php";
+	require_once "resources/classes/event_socket.php";
 }
 
 if(!function_exists('correct_path')) {
diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php
index 0232bbb715..7ce789a6b9 100644
--- a/core/install/resources/classes/detect_switch.php
+++ b/core/install/resources/classes/detect_switch.php
@@ -25,7 +25,7 @@
 
 */
 require_once "root.php";
-require_once "resources/classes/EventSocket.php";
+require_once "resources/classes/event_socket.php";
 
 //define the install class
 	class detect_switch {
@@ -144,7 +144,7 @@ require_once "resources/classes/EventSocket.php";
 		}
 
 		protected function connect_event_socket(){
-			$esl = new EventSocket;
+			$esl = new event_socket;
 			if ($esl->connect($this->event_host, $this->event_port, $this->event_password)) {
 				$this->event_socket = $esl->reset_fp();
 				return true;
@@ -153,7 +153,7 @@ require_once "resources/classes/EventSocket.php";
 		}
 
 		protected function event_socket_request($cmd) {
-			$esl = new EventSocket($this->event_socket);
+			$esl = new event_socket($this->event_socket);
 			$result = $esl->request($cmd);
 			$esl->reset_fp();
 			return $result;
diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php
index 898dcb89a4..0167ea9187 100644
--- a/core/install/resources/classes/install_switch.php
+++ b/core/install/resources/classes/install_switch.php
@@ -348,7 +348,7 @@ include "root.php";
 		}
 
 		protected function restart_switch() {
-			$esl = new EventSocket;
+			$esl = new event_socket;
 			if(!$esl->connect($this->global_settings->switch_event_host(), $this->global_settings->switch_event_port(), $this->global_settings->switch_event_password())) {
 				throw new Exception("Failed to connect to switch");
 			}
diff --git a/resources/classes/EventSocket.php b/resources/classes/EventSocket.php
index 0f4bb239fd..ade3ae1bc6 100644
--- a/resources/classes/EventSocket.php
+++ b/resources/classes/EventSocket.php
@@ -37,13 +37,12 @@ class Buffer {
 		return $tmp;
 	}
 }
-
 //$b = new Buffer;
 //$b->append("hello\nworld\n");
 //print($b->read_line());
 //print($b->read_line());
 
-class EventSocket {
+class event_socket {
 	private $buffer;
 	private $fp;
 
@@ -173,7 +172,7 @@ class EventSocket {
 
 /*
 function event_socket_create($host, $port, $password) {
-	$esl = new EventSocket;
+	$esl = new event_socket;
 	if ($esl->connect($host, $port, $password)) {
 		return $esl->reset_fp();
 	}
@@ -181,14 +180,14 @@ function event_socket_create($host, $port, $password) {
 }
 
 function event_socket_request($fp, $cmd) {
-	$esl = new EventSocket($fp);
+	$esl = new event_socket($fp);
 	$result = $esl->request($cmd);
 	$esl->reset_fp();
 	return $result;
 }
 */
 
-// $esl = new EventSocket;
+// $esl = new event_socket;
 // $esl->connect('127.0.0.1', 8021, 'ClueCon');
 // print($esl->request('api sofia status'));
 
diff --git a/resources/switch.php b/resources/switch.php
index 03cd5ab368..c0c8dcf4af 100644
--- a/resources/switch.php
+++ b/resources/switch.php
@@ -111,7 +111,7 @@ function load_extensions() {
 load_extensions();
 
 function event_socket_create($host, $port, $password) {
-	$esl = new EventSocket;
+	$esl = new event_socket;
 	if ($esl->connect($host, $port, $password)) {
 		return $esl->reset_fp();
 	}
@@ -119,7 +119,7 @@ function event_socket_create($host, $port, $password) {
 }
 
 function event_socket_request($fp, $cmd) {
-	$esl = new EventSocket($fp);
+	$esl = new event_socket($fp);
 	$result = $esl->request($cmd);
 	$esl->reset_fp();
 	return $result;
@@ -142,7 +142,7 @@ function event_socket_request_cmd($cmd) {
 		unset ($prep_statement);
 	}
 
-	$esl = new EventSocket;
+	$esl = new event_socket;
 	if (!$esl->connect($event_socket_ip_address, $event_socket_port, $event_socket_password)) {
 		return false;
 	}
diff --git a/secure/fax_to_email.php b/secure/fax_to_email.php
index c3210c9e45..c33ffe9c36 100644
--- a/secure/fax_to_email.php
+++ b/secure/fax_to_email.php
@@ -301,7 +301,7 @@ if(!function_exists('fax_split_dtmf')) {
 //includes
 	if (!defined('STDIN')) { include "root.php"; }
 	require_once "resources/require.php";
-	include "resources/classes/EventSocket.php";
+	include "resources/classes/event_socket.php";
 	include "resources/phpmailer/class.phpmailer.php";
 	include "resources/phpmailer/class.smtp.php"; // optional, gets called from within class.phpmailer.php if not already loaded