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

dumb phone capable driver acceptance system #2477

Browse Source
This commit is contained in:
Daniel Camargo 2014-03-07 12:25:07 -03:00
parent 96bfb99c69
commit 66880d1811
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/controllers/default/crunchbutton/api/twilio/driver.php
View File

@ -13,7 +13,6 @@ class Controller_api_twilio_driver extends Crunchbutton_Controller_Rest {
$phone = str_replace( '+1', '', $_REQUEST[ 'From' ] );
$body = trim( $_REQUEST[ 'Body' ] );
<<<<<<< HEAD
if( trim( $phone ) == '' ){
$this->adminError();
$this->log( [ 'action' => 'admin not found', 'phone' => $phone, 'body' => $body ] );
@ -21,9 +20,6 @@ class Controller_api_twilio_driver extends Crunchbutton_Controller_Rest {
}
$admin = Admin::getByPhone( $phone );
=======
$admin = Admin::getByPhone( $phone );
>>>>>>> ca05cc9e3a1d1d30696e14442d2498f5eb3c6648
if( !$admin->id_admin ){
$this->adminError();