A few changes from the merge.

app/click_to_call/click_to_call.php

@@ -33,12 +33,10 @@
 include "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-//require_once "includes/checkauth.php";
 if (permission_exists('click_to_call_view')) {
 	//access granted
 }
 else {
-
 	echo "access denied";
 	exit;
 }
@@ -126,7 +124,6 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 			}
 		}
 		else {
-
 			if (strlen($src) < 7) {
 				if (strlen($dest_cid_number) == 0) {
 					//get the caller id from the extension caller id comes from the extension (the source number)
@@ -149,11 +146,10 @@ if (is_array($_REQUEST) && !empty($_REQUEST['src']) && !empty($_REQUEST['dest'])
 			$destination = "{origination_caller_id_name='$dest_cid_name',origination_caller_id_number=$dest_cid_number}".$bridge_array[0];
 			if (permission_exists('click_to_call_call')) {
 				if (strpbrk($dest, '@') != FALSE) {
-                                	//call a sip uri
+				//call a sip uri
 					//echo "Found an @ 4, do nothing for now<br><br>";
 					$switch_cmd = "api originate $source &bridge({origination_caller_id_name='$src_cid_name',origination_caller_id_number=$src_cid_number,call_direction=outbound}sofia/external/$dest)";
 					//echo "<br>SWITCH-CMD: $switch_cmd<br>";
-
 				}
 				else {
 					//regular call

app/dialplan/dialplan_edit.php

@@ -441,10 +441,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 		echo "</table>";
 		echo "<br />\n";
 
-		$sql = " select * from v_dialplan_details ";
+		$sql = "select * from v_dialplan_details ";
-		$sql .= " where domain_uuid = '".$_SESSION['domain_uuid']."' ";
+		$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
-		$sql .= " and dialplan_uuid = '$dialplan_uuid' ";
+		$sql .= "and dialplan_uuid = '$dialplan_uuid' ";
-		$sql .= " order by dialplan_detail_group asc, dialplan_detail_order asc";
+		$sql .= "order by dialplan_detail_group asc, dialplan_detail_order asc";
 		$prep_statement = $db->prepare(check_sql($sql));
 		$prep_statement->execute();
 		$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
@@ -567,7 +567,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 					$x++;
 				} //end foreach
 				unset($sql, $result, $row_count);
-				
 			} //end if results
 
 			echo "<tr>\n";

app/fax/fax_copy.php

@@ -27,7 +27,6 @@ include "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
 require_once "includes/paging.php";
-require_once "app_languages.php";
 if (permission_exists('fax_extension_add')) {
 	//access granted
 }

app/fax/fax_delete.php

@@ -26,7 +26,6 @@
 include "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-require_once "app_languages.php";
 if (permission_exists('fax_extension_delete')) {
 	//access granted
 }

app/fax/fax_view.php

@@ -27,7 +27,6 @@
 include "root.php";
 require_once "includes/require.php";
 require_once "includes/checkauth.php";
-require_once "app_languages.php";
 if (permission_exists('fax_extension_view')) {
 	//access granted
 }

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 <markjcrane@fusionpbx.com>
+--	Copyright (C) 2013 Mark J Crane <markjcrane@fusionpbx.com>
 --	All rights reserved.
 --
 --	Redistribution and use in source and binary forms, with or without