Merge branch 'release/openvbx_1.1'

chadsmith · Nov 3, 2011 · e097074 · e097074
2 parents 1ffb0b0 + a9c1bbe
commit e097074
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/applets/areacode/script.js b/applets/areacode/script.js
@@ -3,8 +3,8 @@ $(function() {
 
 	$('.areacode-applet input.keypress').live('keyup', function(event) {
 		var row = $(this).closest('tr');
-		$('input[name^="keys"]', row).attr('name', 'keys['+$(this).val()+']');
-		$('input[name^="responses"]', row).attr('name', 'responses['+$(this).val()+']');
+		$('input[name^="keys"]', row).attr('name', 'keys[' + $(this).val() + ']');
+		$('input[name^="responses"]', row).attr('name', 'responses[' + $(this).val() + ']');
 	});
 
 	$('.areacode-applet .action.add').live('click', function(event) {

diff --git a/applets/areacode/twiml.php b/applets/areacode/twiml.php
@@ -11,11 +11,11 @@
 		$areacode = $matches[1];
 }
 
-$response = new Response();
+$response = new TwimlResponse;
 
 if(!empty($areacode) && array_key_exists($areacode, $menu_items) && !empty($menu_items[$areacode]))
-	$response->addRedirect($menu_items[$areacode]);
+	$response->redirect($menu_items[$areacode]);
 elseif(!empty($invalid_option))
-	$response->addRedirect($invalid_option);
+	$response->redirect($invalid_option);
 
-$response->Respond();
+$response->respond();
diff --git a/applets/state/script.js b/applets/state/script.js
@@ -3,8 +3,8 @@ $(function() {
 
 	$('.state-applet input.keypress').live('keyup', function(event) {
 		var row = $(this).closest('tr');
-		$('input[name^="keys"]', row).attr('name', 'keys['+$(this).val()+']');
-		$('input[name^="responses"]', row).attr('name', 'responses['+$(this).val()+']');
+		$('input[name^="keys"]', row).attr('name', 'keys[' + $(this).val() + ']');
+		$('input[name^="responses"]', row).attr('name', 'responses[' + $(this).val() + ']');
 	});
 
 	$('.state-applet .action.add').live('click', function(event) {

diff --git a/applets/state/twiml.php b/applets/state/twiml.php
@@ -7,11 +7,11 @@
 if(!empty($_REQUEST['FromState']))
 	$state = strtolower($_REQUEST['FromState']);
 
-$response = new Response();
+$response = new TwimlResponse;
 
 if(!empty($state) && array_key_exists($state, $menu_items) && !empty($menu_items[$state]))
-	$response->addRedirect($menu_items[$state]);
+	$response->redirect($menu_items[$state]);
 elseif(!empty($invalid_option))
-	$response->addRedirect($invalid_option);
+	$response->redirect($invalid_option);
 
-$response->Respond();
+$response->respond();
diff --git a/applets/user/twiml.php b/applets/user/twiml.php
@@ -20,10 +20,10 @@
 	}
 }
 
-$response = new Response();
+$response = new TwimlResponse;
 
 $next = AppletInstance::getDropZoneUrl($is_user ? 'is_user' : 'not_user');
 if(!empty($next))
-	$response->addRedirect($next);
+	$response->redirect($next);
 
-$response->Respond();
+$response->respond();