fix app_defaults, install how to, add 10 or 11 digit support for twilio (#26)

* SMS add support for teli, plivo and logging results of curl

SMS add support for teli, plivo and logging results of curl

* fix app_defaults, install how to, add 10 or 11 digit support for twilio

fix app_defaults, install how to, add 10 or 11 digit support for twilio

sms/INSTALLHOWTO.txt

@@ -0,0 +1,16 @@
+Install HOW TO
+
+1) cd /usr/src/
+2) git clone https://github.com/fusionpbx/fusionpbx-apps
+3) cd fusionpbx-apps/; cp -R sms /var/www/fusionpbx/app/
+4) cd /var/www/fusionpbx/resources/install/scripts/app/
+5) ln -s /var/www/fusionpbx/app/sms/resources/install/scripts/app/sms
+6) Go to GUI
+7) Upgrades -> APP DEFAULTS; MENU DEFAULTS; PERMISSION DEFAULTS
+8) Log out and back in
+9) ADV -> Default Settings
+10) add CARRIER_access_key and CARRIER_secret_key for whatever carrier you want to use
+11) Go to apps -> SMS and add the DID's that you can accept SMS on
+12) Go to Extensions and in the outbound_caller_id_number field add the same DID
+
+Send and receive.

sms/app_defaults.php

@@ -48,7 +48,6 @@ if ($domains_processed == 1) {
 	$array[$x]['default_setting_enabled'] = 'true';
 	$array[$x]['default_setting_description'] = '';
 	$x++;
-<<<<<<< HEAD
 	$array[$x]['default_setting_category'] = 'sms';
 	$array[$x]['default_setting_subcategory'] = 'carriers';
 	$array[$x]['default_setting_name'] = 'array';
@@ -83,16 +82,10 @@ if ($domains_processed == 1) {
 	$array[$x]['default_setting_name'] = 'text';
 	$array[$x]['default_setting_value'] = 'https://sms.teleapi.net/sms/send';
 	$array[$x]['default_setting_enabled'] = 'false';
-=======
-	$array[$x]['default_setting_category'] = 'sms';
-	$array[$x]['default_setting_subcategory'] = 'carriers';
-	$array[$x]['default_setting_name'] = 'array';
-	$array[$x]['default_setting_value'] = 'plivo';
-	$array[$x]['default_setting_enabled'] = 'true';
->>>>>>> fusionpbx/master
 	$array[$x]['default_setting_description'] = '';
 	$x++;
 
+
 /*	$array[$x]['default_setting_category'] = 'sms';
 	$array[$x]['default_setting_subcategory'] = 'flowroute_access_key';
 	$array[$x]['default_setting_name'] = 'text';

sms/resources/install/scripts/app/sms/index.lua

@@ -206,6 +206,13 @@
 		if (carrier == "flowroute") then
 			cmd = "curl -u ".. access_key ..":" .. secret_key .. " -H \"Content-Type: application/json\" -X POST -d '{\"to\":\"" .. to .. "\",\"from\":\"" .. outbound_caller_id_number .."\",\"body\":\"" .. body .. "\"}' " .. api_url;
 		elseif (carrier == "twilio") then
+			if to:len() < 11 then
+				to = "1" .. to;
+			end
+			if outbound_caller_id_number:len() < 11 then
+				outbound_caller_id_number = "1" .. outbound_caller_id_number;
+			end
+		-- Can be either +1NANNNNXXXX or NANNNNXXXX
 			cmd ="curl -X POST '" .. api_url .."' --data-urlencode 'To=+" .. to .."' --data-urlencode 'From=+" .. outbound_caller_id_number .. "' --data-urlencode 'Body=" .. body .. "' -u ".. access_key ..":" .. secret_key .. " --insecure";
 		elseif (carrier == "teli") then
 			cmd ="curl -X POST '" .. api_url .."' --data-urlencode 'destination=" .. to .."' --data-urlencode 'source=" .. outbound_caller_id_number .. "' --data-urlencode 'message=" .. body .. "' --data-urlencode 'token=" .. access_key .. "' --insecure";