From f64358262a02856fa09df52135363843d9848cbb Mon Sep 17 00:00:00 2001
From: Dave C-J <dave@conway-jones.co.uk>
Date: Sun, 9 Feb 2014 11:55:01 +0000
Subject: [PATCH] Updates to Twilio Node Fixes #28 Make edit panel work, and
 then fix it so the things edited do what they say. Slight tweak to shrink
 icon to similar size as others.

---
 social/twilio/56-twilio.html   |  23 +++++++-------
 social/twilio/56-twilio.js     |  56 ++++++++++++++++-----------------
 social/twilio/icons/twilio.png | Bin 717 -> 553 bytes
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/social/twilio/56-twilio.html b/social/twilio/56-twilio.html
index 21badcb7..c73769bf 100644
--- a/social/twilio/56-twilio.html
+++ b/social/twilio/56-twilio.html
@@ -15,31 +15,32 @@
   limitations under the License.
 -->
 
-<script type="text/x-red" data-template-name="twilio">
+<script type="text/x-red" data-template-name="twilio out">
     <div class="form-row">
-        <label for="node-input-title"><i class="icon-flag"></i> Title</label>
-        <input type="text" id="node-input-title" placeholder="Node-RED">
+        <label for="node-input-number"><i class="icon-envelope"></i> SMS to</label>
+        <input type="text" id="node-input-number" placeholder="01234 5678901">
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="icon-tag"></i> Name</label>
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
+    <div class="form-tips">Tip - leave Number blank to use <b>msg.topic</b> to set the number.</div>
 </script>
 
 <script type="text/x-red" data-help-name="twilio out">
-	<p>Uses Twilio to send the <b>msg.payload</b> as a SMS to the configured number.</p>
-	<p>Uses <b>msg.topic</b> to set the phone number, if not already set in the properties.</p>
-	<p>You MUST configure both your Account SID and the Auth Token. Either into settings.js like this</p>
-	<p><pre>twilio: { account:'My-ACCOUNT-SID', authtoken:'TWILIO-TOKEN', from:'FROM-NUMBER' },</pre></p>
-	<p>Or as a twiliokey.js file in the directory <b>above</b> node-red.<p>
-	<p><pre>module.exports = { account:'My-ACCOUNT-SID', authtoken:'TWILIO-TOKEN',from:'FROM-NUMBER' }</pre></p>
+    <p>Uses Twilio to send the <b>msg.payload</b> as a SMS to the configured number.</p>
+    <p>Uses <b>msg.topic</b> to set the phone number, if not already set in the properties.</p>
+    <p>You MUST configure both your Account SID and the Auth Token. Either into settings.js like this</p>
+    <p><pre>twilio: { account:'My-ACCOUNT-SID', authtoken:'TWILIO-TOKEN', from:'FROM-NUMBER' },</pre></p>
+    <p>Or as a twiliokey.js file in the directory <b>above</b> node-red.<p>
+    <p><pre>module.exports = { account:'My-ACCOUNT-SID', authtoken:'TWILIO-TOKEN',from:'FROM-NUMBER' }</pre></p>
 </script>
 
 <script type="text/javascript">
     RED.nodes.registerType('twilio out',{
         category: 'output',
         defaults: {
-            title: {value:""},
+            number: {value:""},
             name: {value:""}
         },
         color:"#ed1c24",
@@ -48,7 +49,7 @@
         icon: "twilio.png",
         align: "right",
         label: function() {
-            return this.name||this.title||"twilio out";
+            return this.name||this.title||"twilio";
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";
diff --git a/social/twilio/56-twilio.js b/social/twilio/56-twilio.js
index 6f301f71..8aca55ff 100644
--- a/social/twilio/56-twilio.js
+++ b/social/twilio/56-twilio.js
@@ -24,41 +24,41 @@ var util = require('util');
 //   module.exports = { account:'My-ACCOUNT-SID', authtoken:'TWILIO-TOKEN',from:'FROM-NUMBER' }
 
 try {
-	var twiliokey = RED.settings.twilio || require(process.env.NODE_RED_HOME+"/../twiliokey.js");
+    var twiliokey = RED.settings.twilio || require(process.env.NODE_RED_HOME+"/../twiliokey.js");
 }
 catch(err) {
-	util.log("[56-twilio.js] Error: Failed to load Twilio credentials");
+    util.log("[56-twilio.js] Error: Failed to load Twilio credentials");
 }
 
 if (twiliokey) {
-	var twilioClient = require('twilio')(twiliokey.account, twiliokey.authtoken);
-	var fromNumber = twiliokey.from;
+    var twilioClient = require('twilio')(twiliokey.account, twiliokey.authtoken);
+    var fromNumber = twiliokey.from;
 }
 
 function TwilioOutNode(n) {
-	RED.nodes.createNode(this,n);
-	this.title = n.title;
-	var node = this;
-	this.on("input",function(msg) {
-		if (typeof(msg.payload) == 'object') {
-			msg.payload = JSON.stringify(msg.payload);
-		}
-		if (twiliokey) {
-			try {
-				// Send SMS
-				twilioClient.sendMessage( {to: msg.topic, from: fromNumber, body: msg.payload}, function(err, response) {
-					if (err) node.error(err);
-					//console.log(response);
-				});
-			}
-			catch (err) {
-				node.error(err);
-			}
-		}
-		else {
-			node.warn("Twilio credentials not set/found. See node info.");
-		}
-	});
+    RED.nodes.createNode(this,n);
+    this.number = n.number;
+    var node = this;
+    this.on("input",function(msg) {
+        if (typeof(msg.payload) == 'object') {
+            msg.payload = JSON.stringify(msg.payload);
+        }
+        if (twiliokey) {
+            try {
+                // Send SMS
+                var tonum = node.number || msg.topic;
+                twilioClient.sendMessage( {to: tonum, from: fromNumber, body: msg.payload}, function(err, response) {
+                    if (err) node.error(err);
+                    //console.log(response);
+                });
+            }
+            catch (err) {
+                node.error(err);
+            }
+        }
+        else {
+            node.warn("Twilio credentials not set/found. See node info.");
+        }
+    });
 }
-
 RED.nodes.registerType("twilio out",TwilioOutNode);
diff --git a/social/twilio/icons/twilio.png b/social/twilio/icons/twilio.png
index 7404be1d01ab4df8d5027bd7eda04b7855d3f2d8..ada41a2c82da6070a988e017f6cf691349ccd0cb 100644
GIT binary patch
delta 441
zcmX@hx{}4aGr-TCmrII^fq{Y7)59eQNGk)e5eGAneAqiF6i6`^2e~^jtUD+363Cel
z;1lBd|L@=b|NsB_^XK2ce}94C>9c>oeoZW^u76m1#vY`jB*-tA!Qt7BG!Q4r+uens
zgH_f8$l)yTh%9Dc;1&j9Muu5)B!GhKC7!;n?Dv>B#FVwvbkDK^^{{%nIEGl9emmth
z*C7KQhud3T-4PLV6;bZcQ2O=%e){$7TTA)wPoHk~GIEx;v7*{WrO7=^ratwj3_U&t
zIZg@dYF@-S=i(aGC!uHW&Re~ULr^0`*Td?;-Y4^vn*OpKPM@iKGI~;G#mlOUB5sMj
zg>Bn+UpDMAs1=beFIm{5;BzV6Fim=IU(Y6<MgFJX2zdT#5@AnHWpa{u>fbbf@f7cQ
z2L*2Ji;vEJ{b^6q^4d7xiQ)!lly>TMr%KJVeCd_qWRqd8eMx^}_*K{YazU)Z%x8Wd
ze588izGCK;1Hs?sv06``B|q;%*Mz84j-_l3>x@24t^B`d+xd<EkG<_#K7U?MVfkMB
fe}DRY51kax*v)aVPe|Ja7)lJDu6{1-oD!M<St7T}

delta 615
zcmZ3<a+bBeGr-TCmrII^fq{Y7)59eQNE?AL2Q!e=d|1&8q*&4&eH|GX)}JtE?Rp91
zOP07slmzFem6RtIr7}3C<R_&nc;+Uirv{}arc@T5Otk?jnjGL0;`;yp|382J{QLLs
zFAzL^_V3&Gf4_eH2eMzi{`cd@-{&tTh7{Gy<T4xpYA`Gb@(TuPAPF$Y&+=1bU|?+a
zba4!+xHV;3__V_cJg%%ej=a2F{eJG>^?8pDCbp>b9GYHoh&RGU^g{__WQ{YUfQAP1
z6h>ADg$sf+>KSDl6i*0Tv&>FqV>$Ha|H6%P7`-CAonC1;3m%U<7tJZj{3}(6%^-14
zxPin;p$<-uhhaU8{!S74ua9fiCHyMj;A{^$nE7FwjL^K~NiAxY_gz?oRCal{RYaEf
zmgIk!)?ne(!cczk|C0_;|48@mv*OR3J`|VpH>!6_bM!`q&Gr4AUHSD@<z4^71Ed5`
zuiCBARqPYL+VqLQ>}xX*=AHZHy^WQn{^P|5XWH&REBbn%vXOb-`fE4rJId6R+LS}L
zs4q&;akt}0O3_UIu6v8u*XWOt!qOW}OJ;}{zd3);n@R17UEk+xYtjmW1brVZO1a|d
z8K|@I-B#9X7n!0{DkR<Gds;6VJLGt#>1-_OJ-^T{&3D~L!>LxABR^mKwkqq<;iXp>
zA4+?C{qOI8uRr=RpFI5X>D8ZWi{5bV=G*^%-n{r11+3Qm;j0ASg*PxV6q#Lqd1u2?
RbzpQdc)I$ztaD0e0s!shG7$g(