From 5f4aaa43aaafccda8ae04273f452c754c80c7fe2 Mon Sep 17 00:00:00 2001
From: Walker Hamilton <myself@walkerhamilton.com>
Date: Wed, 23 Jan 2013 18:22:43 -0600
Subject: [PATCH 1/4] Hide call and online/offline when no application_sid
 present

---
 OpenVBX/views/layout/content/context_menu.php | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/OpenVBX/views/layout/content/context_menu.php b/OpenVBX/views/layout/content/context_menu.php
index d2b473c2..b6f7db52 100644
--- a/OpenVBX/views/layout/content/context_menu.php
+++ b/OpenVBX/views/layout/content/context_menu.php
@@ -1,17 +1,25 @@
 <div id="vbx-context-menu" class="context-menu">
 
 	<div id="vbx-call-sms-buttons">
-		<button class="call-button twilio-call" data-href="<?php echo site_url('messages/call') ?>"><span>Call</span></button>
+		<?php if(isset($callerid_numbers) && count($callerid_numbers) > 1): ?>
+			<?php if (isset($connect_application_sid) && !empty($connect_application_sid['value'])): ?>
+				<button class="call-button twilio-call" data-href="<?php echo site_url('messages/call') ?>"><span>Call</span></button>
+			<?php endif; ?>
+		<?php endif; ?>
 		<button class="sms-button twilio-sms" data-href="<?php echo site_url('messages/sms') ?>"><span>SMS</span></button>
 	</div>
 	
-	 <div id="vbx-client-status" class="<?php echo ($user_online == 1 ? 'online' : ''); ?>">
-		<div class="client-button-wrap">
-	     	<button class="client-button twilio-client">
-	        	<span class="isoffline">Offline</span><span class="isonline">Online</span>
-	     	</button>
-		</div>
-	 </div>
+	<?php if(isset($callerid_numbers) && count($callerid_numbers) > 1): ?>
+		<?php if(isset($connect_application_sid) && !empty($connect_application_sid['value'])): ?>
+			<div id="vbx-client-status" class="<?php echo ($user_online == 1 ? 'online' : ''); ?>">
+				<div class="client-button-wrap">
+					<button class="client-button twilio-client">
+						<span class="isoffline">Offline</span><span class="isonline">Online</span>
+					</button>
+				</div>
+			</div>
+		<?php endif; ?>
+	<?php endif; ?>
 
 	<div class="sms-dialog">
 		<a class="close action" href=""><span class="replace">close</span></a>

From b786b8b32693475306291e2ba495cb73a5dfef6f Mon Sep 17 00:00:00 2001
From: Walker Hamilton <myself@walkerhamilton.com>
Date: Wed, 23 Jan 2013 18:58:22 -0600
Subject: [PATCH 2/4] Changed to #this->application_sid

---
 OpenVBX/views/layout/content/context_menu.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenVBX/views/layout/content/context_menu.php b/OpenVBX/views/layout/content/context_menu.php
index b6f7db52..6edbee05 100644
--- a/OpenVBX/views/layout/content/context_menu.php
+++ b/OpenVBX/views/layout/content/context_menu.php
@@ -2,7 +2,7 @@
 
 	<div id="vbx-call-sms-buttons">
 		<?php if(isset($callerid_numbers) && count($callerid_numbers) > 1): ?>
-			<?php if (isset($connect_application_sid) && !empty($connect_application_sid['value'])): ?>
+			<?php if (isset($this->application_sid) && !empty($this->application_sid)): ?>
 				<button class="call-button twilio-call" data-href="<?php echo site_url('messages/call') ?>"><span>Call</span></button>
 			<?php endif; ?>
 		<?php endif; ?>
@@ -10,7 +10,7 @@
 	</div>
 	
 	<?php if(isset($callerid_numbers) && count($callerid_numbers) > 1): ?>
-		<?php if(isset($connect_application_sid) && !empty($connect_application_sid['value'])): ?>
+		<?php if(isset($this->application_sid) && !empty($this->application_sid)): ?>
 			<div id="vbx-client-status" class="<?php echo ($user_online == 1 ? 'online' : ''); ?>">
 				<div class="client-button-wrap">
 					<button class="client-button twilio-client">

From 527760e93cb7b75d7fe9a19dcfff8e9960957571 Mon Sep 17 00:00:00 2001
From: Walker Hamilton <myself@walkerhamilton.com>
Date: Thu, 24 Jan 2013 10:41:17 -0600
Subject: [PATCH 3/4] Added count_callerid_numbers() and web_calling_enabled()
 to twilio helper. Moved everything in views over to utilize those helpers.

---
 OpenVBX/helpers/twilio_helper.php             | 80 ++++++++++++++++++-
 OpenVBX/views/dialer/numbers.php              |  4 +-
 OpenVBX/views/layout/content/context_menu.php | 28 +++----
 OpenVBX/views/layout/content/utility_menu.php |  2 +-
 .../views/layout/flow-editor/context_menu.php |  4 +-
 .../views/layout/flow-editor/utility_menu.php |  2 +-
 6 files changed, 96 insertions(+), 24 deletions(-)

diff --git a/OpenVBX/helpers/twilio_helper.php b/OpenVBX/helpers/twilio_helper.php
index 2412b4b3..3140522e 100644
--- a/OpenVBX/helpers/twilio_helper.php
+++ b/OpenVBX/helpers/twilio_helper.php
@@ -81,6 +81,84 @@ function validate_rest_request($failure_message = 'Could not validate this reque
 	}
 }
 
+if (!function_exists('generate_capability_token')) {
+	/**
+	 * Generate a capability token for Twilio Client
+	 *
+	 * @param string $allow_incoming 
+	 * @return string
+	 */
+	function generate_capability_token($allow_incoming = true) {
+		$ci =& get_instance();
+		$capability = new Services_Twilio_Capability($ci->twilio_sid, $ci->twilio_token);
+
+		$user_id = intval($ci->session->userdata('user_id'));
+		$user = VBX_user::get(array('id' => $user_id));
+
+		$params = array(
+			'user_id' => $user->user_id,
+		);
+		
+		$token = null;
+		try {
+			$capability->allowClientOutgoing($ci->application_sid, $params);
+			if ($allow_incoming) {
+				$capability->allowClientIncoming($user->id);
+			}
+			$token = $capability->generateToken(VBX_Settings::CLIENT_TOKEN_TIMEOUT);
+		}
+		catch (Exception $e) {
+			log_message('error', $e->getMessage());
+		}
+		
+		return $token;
+	}
+}
+
+if (!function_exists('count_callerid_numbers')) {
+	/**
+	 * Counts the number of Phone numbers available
+	 *
+	 * @return int
+	 */
+	function count_callerid_numbers() {
+		$ci =& get_instance();
+		$ci->load->model('vbx_incoming_numbers');
+		$numbers = array();
+		try
+		{
+			/* Retrieve twilio numbers w/o sandbox */
+			$numbers = $ci->vbx_incoming_numbers->get_numbers();
+		}
+		catch(VBX_IncomingNumberException $e)
+		{
+			error_log($e->getMessage());
+			throw new User_ControllerException($e->getMessage());
+			/* Silent fail */
+			return 0;
+		}
+		return count($numbers);
+	}
+}
+
+if (!function_exists('web_calling_enabled')) {
+	/**
+	 * Determine if there are numbers and a Twilio Client Application SID available for making a call.
+	 *
+	 * @return boolean
+	 */
+	function web_calling_enabled() {
+		$ci =& get_instance();
+		
+		$application_sid = $ci->vbx_settings->get('application_sid', $ci->tenant->id);
+		if(count_callerid_numbers()==0)
+			return false;
+ 		else if(!$application_sid || empty($application_sid))
+			return false;
+		return true;
+	}
+}
+
 if (!function_exists('clean_digits')) {
 	/**
 	 * Cleans Hash and Star characters from returned Digits
@@ -316,5 +394,3 @@ function set_last_known_url($url, $expires = 0)
 		setcookie('last_known_url', $url, intval($expires), '/');
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/OpenVBX/views/dialer/numbers.php b/OpenVBX/views/dialer/numbers.php
index cc8e13a0..4df3d939 100644
--- a/OpenVBX/views/dialer/numbers.php
+++ b/OpenVBX/views/dialer/numbers.php
@@ -1,6 +1,6 @@
 <?php 
 	global $dial_disabled;
-	if (!empty($callerid_numbers) && count($callerid_numbers == 1)): /* callerid_number */ ?>
+	if (count_callerid_numbers() == 1): /* callerid_number */ ?>
 
 	<label class="field-label"><span class="label-text">Caller ID</span>
 		<?php
@@ -15,7 +15,7 @@
 		?>
 	</label>
 
-<?php elseif (!empty($callerid_numbers) && count($callerid_numbers > 1)): /* callerid_numbers */ ?>
+<?php elseif (count_callerid_numbers() > 1): /* callerid_numbers */ ?>
 
 	<?php $c = $callerid_numbers[0]; ?>
 	<?php if(isset($c->trial) && $c->trial == 1): /* is-trail */ ?>
diff --git a/OpenVBX/views/layout/content/context_menu.php b/OpenVBX/views/layout/content/context_menu.php
index 6edbee05..dd914548 100644
--- a/OpenVBX/views/layout/content/context_menu.php
+++ b/OpenVBX/views/layout/content/context_menu.php
@@ -1,26 +1,22 @@
 <div id="vbx-context-menu" class="context-menu">
 
 	<div id="vbx-call-sms-buttons">
-		<?php if(isset($callerid_numbers) && count($callerid_numbers) > 1): ?>
-			<?php if (isset($this->application_sid) && !empty($this->application_sid)): ?>
-				<button class="call-button twilio-call" data-href="<?php echo site_url('messages/call') ?>"><span>Call</span></button>
-			<?php endif; ?>
+		<?php if(web_calling_enabled()): ?>
+			<button class="call-button twilio-call" data-href="<?php echo site_url('messages/call') ?>"><span>Call</span></button>
 		<?php endif; ?>
 		<button class="sms-button twilio-sms" data-href="<?php echo site_url('messages/sms') ?>"><span>SMS</span></button>
 	</div>
 	
-	<?php if(isset($callerid_numbers) && count($callerid_numbers) > 1): ?>
-		<?php if(isset($this->application_sid) && !empty($this->application_sid)): ?>
-			<div id="vbx-client-status" class="<?php echo ($user_online == 1 ? 'online' : ''); ?>">
-				<div class="client-button-wrap">
-					<button class="client-button twilio-client">
-						<span class="isoffline">Offline</span><span class="isonline">Online</span>
-					</button>
-				</div>
+	<?php if(web_calling_enabled()): ?>
+		<div id="vbx-client-status" class="<?php echo ($user_online == 1 ? 'online' : ''); ?>">
+			<div class="client-button-wrap">
+				<button class="client-button twilio-client">
+					<span class="isoffline">Offline</span><span class="isonline">Online</span>
+				</button>
 			</div>
-		<?php endif; ?>
+		</div>
 	<?php endif; ?>
-
+	
 	<div class="sms-dialog">
 		<a class="close action" href=""><span class="replace">close</span></a>
 		<h3>Send a Text Message</h3>
@@ -29,7 +25,7 @@
 				<label class="field-label left">To
 					<input class="small" name="to" type="text" placeholder="(555) 867 5309" value="" />
 				</label>
-				<?php if(isset($callerid_numbers) && count($callerid_numbers) > 1): ?>
+				<?php if(count_callerid_numbers() > 1): ?>
 					<label class="field-label left">From
 						<select name="from" class="small">
 							<?php foreach($callerid_numbers as $number):
@@ -44,7 +40,7 @@
 							<?php endforeach; ?>
 						</select>
 					</label>
-				<?php elseif(isset($callerid_numbers) && count($callerid_numbers) == 1): 
+				<?php elseif(count_callerid_numbers() == 1): 
 					$c = $callerid_numbers[0]; ?>
 					<input type="hidden" name="from" value="<?php echo $c->phone ?>" />
 				<?php endif; ?>
diff --git a/OpenVBX/views/layout/content/utility_menu.php b/OpenVBX/views/layout/content/utility_menu.php
index 1b25df5f..782afc16 100644
--- a/OpenVBX/views/layout/content/utility_menu.php
+++ b/OpenVBX/views/layout/content/utility_menu.php
@@ -4,7 +4,7 @@
 		<li class="vbx-util-item"><span class="username"><?php echo $user->email ?></span></li>
 		<?php endif; ?>
 		<!-- Disabled for now... 
-		<?php if(!empty($callerid_numbers)): ?>
+		<?php if(count_callerid_numbers() > 0): ?>
 		<?php foreach($callerid_numbers as $i => $number): ?>
 			<?php if(isset($number->trial) && $number->trial): ?>
 			<li class="util-menu-item"><p>(Trial Mode)</p></li>
diff --git a/OpenVBX/views/layout/flow-editor/context_menu.php b/OpenVBX/views/layout/flow-editor/context_menu.php
index 5905ba7b..84913e92 100644
--- a/OpenVBX/views/layout/flow-editor/context_menu.php
+++ b/OpenVBX/views/layout/flow-editor/context_menu.php
@@ -32,13 +32,13 @@
 
 		</div><!-- #vbx-context-menu .context-menu -->
 
-		<?php if(!empty($callerid_numbers) && count($callerid_numbers) > 1): ?>
+		<?php if(count_callerid_numbers() > 1): ?>
 		<select name="callerid" class="small hide">
 			<?php foreach($callerid_numbers as $number): ?>
 			<option value="<?php echo $number->phone ?>"><?php echo $number->phone ?></option>
 			<?php endforeach; ?>
 		</select>
-		<?php elseif(!empty($callerid_numbers) && count($callerid_numbers) == 1): ?>
+	<?php elseif(count_callerid_numbers() == 1): ?>
 		<?php $c = $callerid_numbers[0]; ?>
 		<?php if(isset($c->trial) && $c->trial == 1): ?>
 		<input type="hidden" name="callerid" value="" class="small" />
diff --git a/OpenVBX/views/layout/flow-editor/utility_menu.php b/OpenVBX/views/layout/flow-editor/utility_menu.php
index 1b25df5f..782afc16 100644
--- a/OpenVBX/views/layout/flow-editor/utility_menu.php
+++ b/OpenVBX/views/layout/flow-editor/utility_menu.php
@@ -4,7 +4,7 @@
 		<li class="vbx-util-item"><span class="username"><?php echo $user->email ?></span></li>
 		<?php endif; ?>
 		<!-- Disabled for now... 
-		<?php if(!empty($callerid_numbers)): ?>
+		<?php if(count_callerid_numbers() > 0): ?>
 		<?php foreach($callerid_numbers as $i => $number): ?>
 			<?php if(isset($number->trial) && $number->trial): ?>
 			<li class="util-menu-item"><p>(Trial Mode)</p></li>

From bb5f2893b0a70a3ae401c6951ab38334486d753a Mon Sep 17 00:00:00 2001
From: Walker Hamilton <myself@walkerhamilton.com>
Date: Thu, 24 Jan 2013 10:42:53 -0600
Subject: [PATCH 4/4] Newline at end of file

---
 OpenVBX/helpers/twilio_helper.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenVBX/helpers/twilio_helper.php b/OpenVBX/helpers/twilio_helper.php
index 3140522e..f1ca267e 100644
--- a/OpenVBX/helpers/twilio_helper.php
+++ b/OpenVBX/helpers/twilio_helper.php
@@ -394,3 +394,4 @@ function set_last_known_url($url, $expires = 0)
 		setcookie('last_known_url', $url, intval($expires), '/');
 	}
 }
+