sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes #3754

Browse Source
This commit is contained in:
Devin Smith 2014-11-27 10:17:24 -08:00
parent cf82479ef8
commit d4a66e2047
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/config/config.xml
View File

@ -171,8 +171,6 @@
<domain>_DOMAIN_</domain> <domain>_DOMAIN_</domain>
</mailgun> </mailgun>
<twilio> <twilio>
<numbers>+1_PHONE_</numbers>
<numbers>+1_PHONE_</numbers>
<apps> <apps>
<driver>_KEY_</driver> <driver>_KEY_</driver>
<customer>_KEY_</customer> <customer>_KEY_</customer>

16
include/library/Crunchbutton/Message/Sms.php
View File

@ -1,6 +1,9 @@
<? <?
class Crunchbutton_Message_Sms extends Crunchbutton_Message { class Crunchbutton_Message_Sms extends Crunchbutton_Message {
public static function numbers() {
return explode(',',c::config()->site->config('twilio-number')->value);
}
public static function send($from, $to = null, $message = null) { public static function send($from, $to = null, $message = null) {
$break = false; $break = false;
@ -25,15 +28,8 @@ class Crunchbutton_Message_Sms extends Crunchbutton_Message {
$to = [$to]; $to = [$to];
} }
$env = c::getEnv(); $numbers = self::numbers();
if ($from == 'driver') { $from = '+1'.$numbers[array_rand($numbers)];
$from = c::config()->twilio->{$env}->outgoingTextDriver;
} elseif ($from == 'restaurant') {
$from = c::config()->twilio->{$env}->outgoingTextRestaurant;
} else {
$from = c::config()->twilio->{$env}->outgoingTextCustomer;
}
$message = trim($message); $message = trim($message);
if ($break) { if ($break) {
@ -72,7 +68,7 @@ class Crunchbutton_Message_Sms extends Crunchbutton_Message {
} }
// dont message our own numbers // dont message our own numbers
if (in_array($t, c::config()->twilio->numbers)) { if (in_array($t, $numbers)) {
continue; continue;
} }