From 43dc365ba585d142f43163adc7f85a265a96c426 Mon Sep 17 00:00:00 2001
From: Chad Smith <chad@nospam.me>
Date: Tue, 5 Jul 2011 13:05:03 -0500
Subject: [PATCH 1/3] Fix for SMS flows; Transfer to any part of flow.

---
 applets/transfer/applet.json |   0
 applets/transfer/icon.png    | Bin
 applets/transfer/script.js   |  12 ++++
 applets/transfer/twiml.php   |   7 +--
 applets/transfer/ui.php      | 113 +++++++++++++++--------------------
 5 files changed, 63 insertions(+), 69 deletions(-)
 mode change 100644 => 100755 applets/transfer/applet.json
 mode change 100644 => 100755 applets/transfer/icon.png
 create mode 100755 applets/transfer/script.js
 mode change 100644 => 100755 applets/transfer/twiml.php
 mode change 100644 => 100755 applets/transfer/ui.php

diff --git a/applets/transfer/applet.json b/applets/transfer/applet.json
old mode 100644
new mode 100755
diff --git a/applets/transfer/icon.png b/applets/transfer/icon.png
old mode 100644
new mode 100755
diff --git a/applets/transfer/script.js b/applets/transfer/script.js
new file mode 100755
index 0000000..e0f0ed1
--- /dev/null
+++ b/applets/transfer/script.js
@@ -0,0 +1,12 @@
+$(function(){
+	$(".subflow-applet input[type=radio]").live('click', function(event) {
+		var tr = $(this).closest('tr');
+		
+		tr.closest('table').find('tr').each(function (index, element) {
+			// Set the others to off
+			$(element).removeClass('on').addClass('off');
+		});
+		
+		tr.addClass('on').removeClass('off');
+	});
+});
\ No newline at end of file
diff --git a/applets/transfer/twiml.php b/applets/transfer/twiml.php
old mode 100644
new mode 100755
index 948b57f..1717403
--- a/applets/transfer/twiml.php
+++ b/applets/transfer/twiml.php
@@ -5,9 +5,8 @@
 
 if ($redirect_type_selector == "flow")
 {
-	$gotoflow_raw = AppletInstance::getValue('gotoflow');
-	$gotoflow_url = site_url("/twiml/applet/voice/" . $gotoflow_raw . "/start");
-	
+	$gotoflow = AppletInstance::getValue('gotoflow');
+	$gotoflow_url = site_url("/twiml/applet/" . AppletInstance::getFlowType() . "/" . $gotoflow);
 	$response = new Response();
 	$response->addRedirect($gotoflow_url);
 	$response->Respond();
@@ -26,4 +25,4 @@
 else
 {
 	trigger_error("Unexpected redirect-type-selector value of '$redirect_type_selector'");
-}
\ No newline at end of file
+}
diff --git a/applets/transfer/ui.php b/applets/transfer/ui.php
old mode 100644
new mode 100755
index 38ba8fa..db76cbd
--- a/applets/transfer/ui.php
+++ b/applets/transfer/ui.php
@@ -1,74 +1,57 @@
 <?php 
 $gotoflow = AppletInstance::getValue('gotoflow');
 $redirect_type_selector = AppletInstance::getValue('redirect-type-selector', 'flow');
-
 ?>
 <div class="vbx-applet subflow-applet">
 		<h2>Transfer</h2>
 		<p>Continue this flow by starting another flow or redirecting to a TwiML URL.</p>
-		<?php 
-		
-		/*
-		foreach(OpenVBX::GetFlows() as $flow)
-		{
-			
-			echo $flow->values['name'];
-		}
-		*/
-		?>
-		<pre><?php // print_r(OpenVBX::GetFlows()); ?></pre>
-
-
-	<div class="radio-table">
-		<table>
-			<tr class="radio-table-row first <?php echo ($redirect_type_selector === 'flow') ? 'on' : 'off' ?>">
-				<td class="radio-cell">
-					<input type="radio" name="redirect-type-selector" value="flow" <?php echo ($redirect_type_selector === 'flow') ? 'checked="checked"' : '' ?> />
-				</td>
-				<td class="content-cell">
-					<div style="float: left;"><h4>Redirect to a call flow</h4></div>
-					<div style="float: right;">
-
-					<select name="gotoflow" class="medium">
-						<?php foreach(OpenVBX::GetFlows() as $flow): ?>
-						<option value="<?php echo $flow->values['id']; ?>" <?php echo ($gotoflow == $flow->values['id'])? 'selected="selected"' : '' ?>><?php echo $flow->values['name'];?></option>
-						<?php endforeach; ?>
-					</select>
-
-
-					</div>
-				</td>
-			</tr>
-			<tr class="radio-table-row last <?php echo ($redirect_type_selector === 'url') ? 'on' : 'off' ?>">
-				<td class="radio-cell">
-					<input type="radio" name="redirect-type-selector" value="url" <?php echo ($redirect_type_selector === 'url') ? 'checked="checked"' : '' ?> />
-				</td>
-				<td class="content-cell">
-					<div style="float: left;"><h4>Redirect to a URL</h4></div>
-					<div style="float: right;">
-						<div class="vbx-input-container input">
-							<input type="text" class="medium" name="gotourl" value="<?php echo AppletInstance::getValue('gotourl') ?>"/>
-						</div>
-					</div>
-				</td>
-			</tr>
-		</table>
-		<script>
-		$(".subflow-applet input[type=radio]").live('click', function(event) {
-			var tr = $(this).closest('tr');
-			
-			tr.closest('table').find('tr').each(function (index, element) {
-				// Set the others to off
-				$(element).removeClass('on').addClass('off');
-			});
-			
-			tr.addClass('on').removeClass('off');
-		});
-			
-		</script>
-	</div>
-
+		<div class="radio-table">
+			<fieldset class="vbx-input-container">
+				<table>
+					<tr class="radio-table-row first <?php echo ($redirect_type_selector === 'flow') ? 'on' : 'off' ?>">
+						<td class="radio-cell">
+							<input type="radio" name="redirect-type-selector" value="flow" <?php echo ($redirect_type_selector === 'flow') ? 'checked="checked"' : '' ?> />
+						</td>
+						<td class="content-cell">
+							<div style="float: left;"><h4>Redirect to a flow</h4></div>
+							<div style="float: right;">
+							<select name="gotoflow" class="medium">
+<?php
+	foreach(OpenVBX::GetFlows() as $flow):
+		$data = json_decode($flow->values['voice' == AppletInstance::getFlowType() ? 'data' : 'sms_data'], true);
+		if(empty($data))
+			continue;
+		if(is_object($data))
+			$data = get_object_vars($data);
+?>
+								<optgroup label="<?php echo htmlentities($flow->values['name']); ?>">
+<?php
+		foreach($data as $id => $instance):
+			$url = $flow->values['id'] . '/' . $id;
+?>
+									<option value="<?php echo $url; ?>" <?php echo ($gotoflow == $url)? 'selected="selected"' : '' ?>><?php echo htmlentities($instance['name']); ?></option>
+<?php	endforeach; ?>
+								</optgroup>
+<?php endforeach; ?>
+							</select>
+							</div>
+						</td>
+					</tr>
+					<tr class="radio-table-row last <?php echo ($redirect_type_selector === 'url') ? 'on' : 'off' ?>">
+						<td class="radio-cell">
+							<input type="radio" name="redirect-type-selector" value="url" <?php echo ($redirect_type_selector === 'url') ? 'checked="checked"' : '' ?> />
+						</td>
+						<td class="content-cell">
+							<div style="float: left;"><h4>Redirect to a URL</h4></div>
+							<div style="float: right;">
+								<div class="vbx-input-container input">
+									<input type="text" class="medium" name="gotourl" value="<?php echo AppletInstance::getValue('gotourl') ?>"/>
+								</div>
+							</div>
+						</td>
+					</tr>
+				</table>
+			</fieldset>
+		</div>
 		<br />
-
-
 </div><!-- .vbx-applet -->

From 0f605a02c4b378ab4e5822de066173edd10c8990 Mon Sep 17 00:00:00 2001
From: Chad Smith <chad@nospam.me>
Date: Tue, 23 Aug 2011 13:17:48 -0500
Subject: [PATCH 2/3] Update for jQuery 1.6

---
 applets/transfer/script.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applets/transfer/script.js b/applets/transfer/script.js
index e0f0ed1..4c393bb 100755
--- a/applets/transfer/script.js
+++ b/applets/transfer/script.js
@@ -1,5 +1,5 @@
 $(function(){
-	$(".subflow-applet input[type=radio]").live('click', function(event) {
+	$('.subflow-applet input[type="radio"]').live('click', function(event) {
 		var tr = $(this).closest('tr');
 		
 		tr.closest('table').find('tr').each(function (index, element) {
@@ -9,4 +9,4 @@ $(function(){
 		
 		tr.addClass('on').removeClass('off');
 	});
-});
\ No newline at end of file
+});

From 45d69ac78786fc785fa5210bd7f8a990e7a7aa33 Mon Sep 17 00:00:00 2001
From: Chad Smith <chad@nospam.me>
Date: Wed, 12 Oct 2011 11:03:18 -0500
Subject: [PATCH 3/3] Update for OpenVBX 1.1

---
 applets/transfer/twiml.php | 30 +++++++++---------------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/applets/transfer/twiml.php b/applets/transfer/twiml.php
index 1717403..955a579 100755
--- a/applets/transfer/twiml.php
+++ b/applets/transfer/twiml.php
@@ -1,28 +1,16 @@
 <?php
-$response = new Response();
+$response = new TwimlResponse;
 
 $redirect_type_selector = AppletInstance::getValue('redirect-type-selector');
 
-if ($redirect_type_selector == "flow")
-{
-	$gotoflow = AppletInstance::getValue('gotoflow');
-	$gotoflow_url = site_url("/twiml/applet/" . AppletInstance::getFlowType() . "/" . $gotoflow);
-	$response = new Response();
-	$response->addRedirect($gotoflow_url);
-	$response->Respond();
-	exit;
-}
-
-else if ($redirect_type_selector == "url")
-{
+if($redirect_type_selector == 'url') {
 	$gotourl = AppletInstance::getValue('gotourl');
-	$response = new Response();
-	$response->addRedirect($gotourl);
-	$response->Respond();
-	exit;
+	$response->redirect($gotourl);
 }
-
-else
-{
-	trigger_error("Unexpected redirect-type-selector value of '$redirect_type_selector'");
+else {
+	$gotoflow = AppletInstance::getValue('gotoflow');
+	$gotoflow_url = site_url('/twiml/applet/' . AppletInstance::getFlowType() . '/' . $gotoflow);
+	$response->redirect($gotoflow_url);
 }
+
+$response->respond();