Skip to content
This repository
Browse code

Merge branch 'release/1.2.8'

  • Loading branch information...
commit d99f8a511ca85fb4b90f15d883903a99864617a8 2 parents 5a0c0ca + d7e5c82
Shawn Parker authored June 13, 2012
7  CHANGELOG.markdown
Source Rendered
... ...
@@ -1,5 +1,12 @@
1 1
 # OpenVBX Change Log
2 2
 
  3
+## OpenVBX 1.2.8
  4
+
  5
+- 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.
  6
+- 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.
  7
+- Fixed an issue where a server that doesn't support the GitHub library for version checking would also hide the Tenants Settings tab.
  8
+
  9
+
3 10
 ## OpenVBX 1.2.7
4 11
 
5 12
 - remove reference to $30 credit when signing up for a Twilio trial accounts
2  OpenVBX/config/version.php
... ...
@@ -1,3 +1,3 @@
1 1
 <?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
2 2
 
3  
-$config['version'] = '1.2.7';
  3
+$config['version'] = '1.2.8';
17  OpenVBX/controllers/settings/site.php
@@ -136,16 +136,19 @@ private function get_site()
136 136
 		// @todo - find a more graceful way around this
137 137
 		// @todo - notify admin that checks can't be made?
138 138
 		$data['check_upgrade'] = $this->can_check_upgrade();
139  
-
140  
-		if($this->tenant->name == 'default' && $data['check_upgrade'])
  139
+		
  140
+		if($this->tenant->name == 'default')
141 141
 		{
142 142
 			$data['tenant_mode'] = self::MODE_MULTI;
143 143
 			$data['tenants'] = $this->settings->get_all_tenants();
144  
-			$data['latest_version'] = $this->get_latest_tag();
145  
-
146  
-			if (version_compare($data['openvbx_version'], $data['latest_version'], '<'))
147  
-			{
148  
-				$data['upgrade_notice'] = true;
  144
+			
  145
+			if ($data['check_upgrade']) {
  146
+				$data['latest_version'] = $this->get_latest_tag();
  147
+		
  148
+				if (version_compare($data['openvbx_version'], $data['latest_version'], '<'))
  149
+				{
  150
+					$data['upgrade_notice'] = true;
  151
+				}
149 152
 			}
150 153
 		}
151 154
 
4  OpenVBX/libraries/OpenVBX.php
@@ -445,9 +445,7 @@ public static function validateRequest($url = false, $post_vars = false)
445 445
 		
446 446
 		// without rewrite enabled we need to ensure that the query string
447 447
 		// is properly appended to the url when being reconstructed
448  
-		if ($ci->vbx_settings->get('rewrite_enabled', VBX_PARENT_TENANT) < 1 
449  
-			&& !empty($_SERVER['QUERY_STRING'])
450  
-			&& strpos($url, $_SERVER['QUERY_STRING']) === false)
  448
+		if (!empty($_SERVER['QUERY_STRING']) && strpos($url, $_SERVER['QUERY_STRING']) === false)
451 449
 		{
452 450
 			$url .= '?'.$_SERVER['QUERY_STRING'];
453 451
 		}
2  plugins/standard/applets/dial/TwimlDial.php
@@ -24,7 +24,7 @@ class TwimlDial {
24 24
 	
25 25
 	public $dial;
26 26
 	
27  
-	protected $timeout;
  27
+	protected $timeout = false;
28 28
 	protected $transcribe = true;
29 29
 	protected $voice = 'man';
30 30
 	protected $language = 'en';

0 notes on commit d99f8a5

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