diff --git a/www/agc/api.php b/www/agc/api.php
index 8489a5ff..5c9bcd23 100644
--- a/www/agc/api.php
+++ b/www/agc/api.php
@@ -90,10 +90,11 @@
 # 170209-1222 - Added URL and IP logging
 # 170220-1303 - Added switch_lead function
 # 170527-2250 - Fix for rare inbound logging issue #1017, Added variable filtering
+# 170815-1314 - Added HTTP error code 418
 #
 
-$version = '2.14-56';
-$build = '170527-2250';
+$version = '2.14-57';
+$build = '170815-1314';
 
 $startMS = microtime();
 
@@ -395,6 +396,26 @@ if ($function == 'version')
 
 
 
+################################################################################
+### BEGIN - coffee/teapot 418 - reject coffee requests
+################################################################################
+if ( ($function == 'coffee') or ($function == 'start_coffee') or ($function == 'make_coffee') or ($function == 'brew_coffee') )
+	{
+	$data = _QXZ("Coffee").": $function|Error 418 I'm a teapot";
+	$result = _QXZ("ERROR");
+	Header("HTTP/1.0 418 I'm a teapot");
+	echo "$data";
+	api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$value,$result,$result_reason,$source,$data);
+	exit;
+	}
+################################################################################
+### END - coffee/teapot
+################################################################################
+
+
+
+
+
 ################################################################################
 ### BEGIN - user validation section (most functions run through this first)
 ################################################################################
@@ -4136,7 +4157,8 @@ function api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$val
 			}
 
 		$NOW_TIME = date("Y-m-d H:i:s");
-		$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result='$result',result_reason='$result_reason',source='$source',data='$data',api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
+		$data = preg_replace("/\"/","'",$data);
+		$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result=\"$result\",result_reason='$result_reason',source='$source',data=\"$data\",api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
 		$rslt=mysql_to_mysqli($stmt, $link);
 		$ALaffected_rows = mysqli_affected_rows($link);
 		$api_id = mysqli_insert_id($link);
diff --git a/www/vicidial/non_agent_api.php b/www/vicidial/non_agent_api.php
index d3b9afee..4b2cf5b2 100644
--- a/www/vicidial/non_agent_api.php
+++ b/www/vicidial/non_agent_api.php
@@ -123,10 +123,11 @@
 # 170609-1107 - Added ccc_lead_info function
 # 170615-0006 - Added DIAL status for manual dial agent calls that have not been answered, to 4 functions
 # 170713-2312 - Fix for issue #1028
+# 170815-1315 - Added HTTP error code 418
 #
 
-$version = '2.14-99';
-$build = '170713-2312';
+$version = '2.14-100';
+$build = '170815-1315';
 $api_url_log = 0;
 
 $startMS = microtime();
@@ -710,6 +711,26 @@ if ($function == 'version')
 
 
 
+
+################################################################################
+### BEGIN - coffee/teapot 418 - reject coffee requests
+################################################################################
+if ( ($function == 'coffee') or ($function == 'start_coffee') or ($function == 'make_coffee') or ($function == 'brew_coffee') )
+	{
+	$data = _QXZ("Coffee").": $function|Error 418 I'm a teapot";
+	$result = _QXZ("ERROR");
+	Header("HTTP/1.0 418 I'm a teapot");
+	echo "$data";
+	api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$value,$result,$result_reason,$source,$data);
+	exit;
+	}
+################################################################################
+### END - coffee/teapot
+################################################################################
+
+
+
+
 ##### BEGIN user authentication for all functions below #####
 $auth=0;
 $auth_message = user_authorization($user,$pass,'REPORTS',1,1);
@@ -10412,7 +10433,8 @@ function api_log($link,$api_logging,$api_script,$user,$agent_user,$function,$val
 			}
 
 		$NOW_TIME = date("Y-m-d H:i:s");
-		$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result='$result',result_reason='$result_reason',source='$source',data='$data',api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
+		$data = preg_replace("/\"/","'",$data);
+		$stmt="INSERT INTO vicidial_api_log set user='$user',agent_user='$agent_user',function='$function',value='$value',result=\"$result\",result_reason='$result_reason',source='$source',data=\"$data\",api_date='$NOW_TIME',api_script='$api_script',run_time='$TOTALrun',webserver='$webserver_id',api_url='$url_id';";
 		$rslt=mysql_to_mysqli($stmt, $link);
 		$ALaffected_rows = mysqli_affected_rows($link);
 		$api_id = mysqli_insert_id($link);