Skip to content
Browse files

Merge pull request #1 from mimecine/master

Just a spelling correction passwod -> password
  • Loading branch information...
2 parents 1b20697 + d193e36 commit b51df3d3ccb8b48a3ef2edb6b1cf638059057587 @MichaelMackus MichaelMackus committed Oct 18, 2011
Showing with 9 additions and 5 deletions.
  1. +8 −4 OpenVBX/models/vbx_incoming_numbers.php
  2. +1 −1 OpenVBX/views/install/main.php
View
12 OpenVBX/models/vbx_incoming_numbers.php
@@ -150,6 +150,7 @@ function get_numbers($retrieve_sandbox = true)
$this->tropo_password);
$applications = json_decode($provisioner->viewApplications());
$appNumbers = json_decode($provisioner->viewAddresses());
+
} catch (Exception $e) {
throw new VBX_IncomingNumberException('Failed to connect to Tropo.', 999);
}
@@ -159,10 +160,13 @@ function get_numbers($retrieve_sandbox = true)
// $provisioner->viewAddresses($application->id));
$numbersResult = array();
foreach ($appNumbers as $number) {
- $appID = substr($number->application,
- strrpos($number->application, '/')+1);
- if ($application->id == $appID)
- $numbersResult[] = $number;
+ if(isset($number->application)){
+ $appID = substr($number->application,
+ strrpos($number->application, '/')+1);
+ if ($application->id == $appID)
+ $numbersResult[] = $number;
+ }
+
}
// Assign the phono app address to the number
View
2 OpenVBX/views/install/main.php
@@ -129,7 +129,7 @@
</label>
<label for="iTropoPassword">Tropo Password
- <input id="iTropoPassword" class="medium" type="password" name="tropo_password" value="<?php echo htmlspecialchars($tropo_passwod)?>" />
+ <input id="iTropoPassword" class="medium" type="password" name="tropo_password" value="<?php echo htmlspecialchars($tropo_password)?>" />
</label>
<label for="iPhonoApiKey">Phono API Key

0 comments on commit b51df3d

Please sign in to comment.
Something went wrong with that request. Please try again.