Merge pull request #530 from pradosoft/prado-3.2.43.2.4prado-3.2

Backports for Prado 3.2.4

5 files changed, 13 insertions, 22 deletions

diff --git a/framework/Web/Services/TFeedService.php b/framework/Web/Services/TFeedService.php
index a1518d4e..75775f49 100644
--- a/framework/Web/Services/TFeedService.php
+++ b/framework/Web/Services/TFeedService.php
@@ -5,7 +5,7 @@
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Knut Urdalen <knut.urdalen@gmail.com>
  * @link http://www.pradosoft.com
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.Services
@@ -132,7 +132,7 @@ class TFeedService extends TService
 				else
 					throw new TConfigurationException('feedservice_class_required',$id);
 			}
-			
+
 			// init feed properties
 			foreach($properties as $name=>$value)
 				$feed->setSubproperty($name,$value);
diff --git a/framework/Web/Services/TJsonService.php b/framework/Web/Services/TJsonService.php
index 15701a9a..e3b9b1cb 100644
--- a/framework/Web/Services/TJsonService.php
+++ b/framework/Web/Services/TJsonService.php
@@ -4,9 +4,8 @@
  *
  * @author Wei Zhuo <weizhuo[at]gamil[dot]com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TJsonService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  */
 
@@ -47,7 +46,6 @@
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
- * @version $Id: TJsonService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.1
  */
@@ -132,7 +130,7 @@ class TJsonService extends TService
 						throw new TConfigurationException('jsonservice_response_type_invalid',$id);
 				}
 				else
-					throw new TConfigurationException('jsonservice_class_required',$id);	
+					throw new TConfigurationException('jsonservice_class_required',$id);
 			}
 		}
 		else
@@ -172,7 +170,6 @@ class TJsonService extends TService
  * will be empty if the returned content is null.
  *
  * @author Wei Zhuo <weizhuo[at]gmail[dot]com>
- * @version $Id: TJsonService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.1
  */
diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 8e052693..f0dd8c1a 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -4,9 +4,8 @@
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TPageService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  */
 
@@ -70,7 +69,6 @@ Prado::using('System.Web.UI.TThemeManager');
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @author Carl G. Mathisen <carlgmathisen@gmail.com>
- * @version $Id: TPageService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.0
  */
@@ -547,7 +545,6 @@ class TPageService extends TService
  * Configurations along this path are merged together to be provided for the page.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TPageService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.0
  */
@@ -657,14 +654,14 @@ class TPageConfiguration extends TComponent
 		Prado::trace("Loading page configuration file $fname",'System.Web.Services.TPageService');
 		if(empty($fname) || !is_file($fname))
 			return;
-		
+
 		if(Prado::getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			$fcontent = include $fname;
 			$this->loadFromPhp($fcontent,dirname($fname),$configPagePath);
 		}
 		else
-		{	
+		{
 			$dom=new TXmlDocument;
 			if($dom->loadFromFile($fname))
 				$this->loadFromXml($dom,dirname($fname),$configPagePath);
@@ -692,7 +689,7 @@ class TPageConfiguration extends TComponent
 		$this->loadApplicationConfigurationFromXml($dom,$configPath);
 		$this->loadPageConfigurationFromXml($dom,$configPath,$configPagePath);
 	}
-	
+
 	public function loadApplicationConfigurationFromPhp($config,$configPath)
 	{
 		$appConfig=new TApplicationConfiguration;
@@ -775,7 +772,7 @@ class TPageConfiguration extends TComponent
 				if(isset($page['properties']))
 				{
 					$properties=$page['properties'];
-					unset($page['properties']);	
+					unset($page['properties']);
 				}
 				$matching=false;
 				$id=($configPagePath==='')?$id:$configPagePath.'.'.$id;
@@ -787,7 +784,7 @@ class TPageConfiguration extends TComponent
 					$this->_properties=array_merge($this->_properties,$properties);
 			}
 		}
-		
+
 		// external configurations
 		if(isset($config['includes']) && is_array($config['includes']))
 		{
diff --git a/framework/Web/Services/TRpcService.php b/framework/Web/Services/TRpcService.php
index a2691af4..a4ed3d7c 100644
--- a/framework/Web/Services/TRpcService.php
+++ b/framework/Web/Services/TRpcService.php
@@ -480,7 +480,6 @@ class TJsonRpcProtocol extends TRpcProtocol
 			if(!is_array($parameters))
 				$parameters = array($parameters);
 
-			$ret = $this->callApiMethod($_request['method'], $parameters);
 			// a request without an id is a notification that doesn't need a response
 			if($this->_id !== null)
 			{
@@ -489,7 +488,7 @@ class TJsonRpcProtocol extends TRpcProtocol
 					return $this->encode(array(
 						'jsonrpc' => '2.0',
 						'id' => $this->_id,
-						'result' => $ret
+						'result' => $this->callApiMethod($_request['method'], $parameters),
 					));
 				} else {
 					return $this->encode(array(
diff --git a/framework/Web/Services/TSoapService.php b/framework/Web/Services/TSoapService.php
index 2d59f462..c928dc06 100644
--- a/framework/Web/Services/TSoapService.php
+++ b/framework/Web/Services/TSoapService.php
@@ -5,9 +5,8 @@
  * @author Knut Urdalen <knut.urdalen@gmail.com>
  * @author Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2013 PradoSoft
+ * @copyright Copyright &copy; 2005-2014 PradoSoft
  * @license http://www.pradosoft.com/license/
- * @version $Id: TSoapService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  */
 
@@ -156,7 +155,7 @@ class TSoapService extends TService
 	 * @throws TConfigurationException if soap server id is not specified or duplicated
 	 */
 	private function loadConfig($config)
-	{	
+	{
 		if($this->getApplication()->getConfigurationType()==TApplication::CONFIG_TYPE_PHP)
 		{
 			if(is_array($config))
@@ -296,7 +295,6 @@ class TSoapService extends TService
  * It also manages the URI for the SOAP service and WSDL.
  *
  * @author Qiang Xue <qiang.xue@gmail.com>
- * @version $Id: TSoapService.php 3245 2013-01-07 20:23:32Z ctrlaltca $
  * @package System.Web.Services
  * @since 3.1
  */