A few changes from the merge.

core/default_settings/default_setting_edit.php

@@ -91,7 +91,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 				$sql .= "default_setting_name, ";
 				$sql .= "default_setting_value, ";
 				$sql .= "default_setting_enabled, ";
-				$sql .= "default_setting_description ";	
+				$sql .= "default_setting_description ";
 				$sql .= ")";
 				$sql .= "values ";
 				$sql .= "(";
@@ -210,12 +210,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 
 	echo "<tr>\n";
 	echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	Type:\n";
+	echo "	Name:\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input class='formfld' type='text' name='default_setting_name' maxlength='255' value=\"$default_setting_name\">\n";
 	echo "<br />\n";
-	echo "Enter the type.\n";
+	echo "Enter the name.\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 

includes/install/scripts/intercept.lua

@@ -106,7 +106,7 @@ if ( session:ready() ) then
 		if (debug["sql"]) then
 			freeswitch.consoleLog("NOTICE", "sql "..sql.."\n");
 		end
-		dbh:query(sql, function(result)
+			dbh:query(sql, function(result)
 			--for key, val in pairs(result) do
 			--	freeswitch.consoleLog("NOTICE", "result "..key.." "..val.."\n");
 			--end

includes/install/scripts/xml_handler.lua

@@ -1,6 +1,6 @@
 --	xml_handler.lua
 --	Part of FusionPBX
---	Copyright (C) 2010 Mark J Crane <[email protected]>
+--	Copyright (C) 2013 Mark J Crane <[email protected]>
 --	All rights reserved.
 --
 --	Redistribution and use in source and binary forms, with or without