Permalink
Browse files

Merge branch 'release/1.2.8'

  • Loading branch information...
2 parents 5a0c0ca + d7e5c82 commit d99f8a511ca85fb4b90f15d883903a99864617a8 @Gipetto Gipetto committed Jun 13, 2012
View
@@ -1,5 +1,12 @@
# OpenVBX Change Log
+## OpenVBX 1.2.8
+
+- Fixed TwimlDial class to properly set the dial timeout as passed in. Fixes an issue where the system settings dial timeout value wouldn't apply to the dial applet.
+- No longer using VBX settings for rewrite to allow or deny GET params in the request validation to support GET as well as POST methods on incoming TwiML requests. Props to @fomojola.
+- Fixed an issue where a server that doesn't support the GitHub library for version checking would also hide the Tenants Settings tab.
+
+
## OpenVBX 1.2.7
- remove reference to $30 credit when signing up for a Twilio trial accounts
@@ -1,3 +1,3 @@
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-$config['version'] = '1.2.7';
+$config['version'] = '1.2.8';
@@ -136,16 +136,19 @@ private function get_site()
// @todo - find a more graceful way around this
// @todo - notify admin that checks can't be made?
$data['check_upgrade'] = $this->can_check_upgrade();
-
- if($this->tenant->name == 'default' && $data['check_upgrade'])
+
+ if($this->tenant->name == 'default')
{
$data['tenant_mode'] = self::MODE_MULTI;
$data['tenants'] = $this->settings->get_all_tenants();
- $data['latest_version'] = $this->get_latest_tag();
-
- if (version_compare($data['openvbx_version'], $data['latest_version'], '<'))
- {
- $data['upgrade_notice'] = true;
+
+ if ($data['check_upgrade']) {
+ $data['latest_version'] = $this->get_latest_tag();
+
+ if (version_compare($data['openvbx_version'], $data['latest_version'], '<'))
+ {
+ $data['upgrade_notice'] = true;
+ }
}
}
@@ -445,9 +445,7 @@ public static function validateRequest($url = false, $post_vars = false)
// without rewrite enabled we need to ensure that the query string
// is properly appended to the url when being reconstructed
- if ($ci->vbx_settings->get('rewrite_enabled', VBX_PARENT_TENANT) < 1
- && !empty($_SERVER['QUERY_STRING'])
- && strpos($url, $_SERVER['QUERY_STRING']) === false)
+ if (!empty($_SERVER['QUERY_STRING']) && strpos($url, $_SERVER['QUERY_STRING']) === false)
{
$url .= '?'.$_SERVER['QUERY_STRING'];
}
@@ -24,7 +24,7 @@ class TwimlDial {
public $dial;
- protected $timeout;
+ protected $timeout = false;
protected $transcribe = true;
protected $voice = 'man';
protected $language = 'en';

0 comments on commit d99f8a5

Please sign in to comment.