refs #997 - add config option; allow users to revert to previous behavior

git-svn-id: http://dev.piwik.org/svn/trunk@1574 59fd770c-687e-43c8-a1e3-f5a4ff64c105

config/global.ini.php

@@ -144,6 +144,11 @@ jquery_version = 1.3.2
 jqueryui_version = 1.7.2
 swfobject_version = 2.2
 
+; If set to 0, Flash widgets require separate HTTP requests
+; (i.e., one request to load the JavaScript which instantiates Open Flash Chart; the other request is made by OFC to download the JSON data for the chart)
+; If set to 1, Piwik uses a single HTTP request per Flash widget to serve both the widget and data
+serve_widget_and_data = 1
+
 [Tracker]
 ; set to 0 if you want to stop tracking the visitors. Useful if you need to stop all the connections on the DB.
 record_statistics			= 1

core/ViewDataTable/GenerateGraphHTML.php

@@ -100,8 +100,9 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable
 		
 		$url = Piwik_Url::getCurrentQueryStringWithParametersModified($this->parametersToModify);
 
+		$this->includeData = Zend_Registry::get('config')->General->serve_widget_and_data;
 		$idSite = Piwik_Common::getRequestVar('idSite', 1);
-		if(Piwik::isUserHasViewAccess($idSite))
+		if(Piwik::isUserHasViewAccess($idSite) && $this->includeData)
 		{
 			$this->chartData = $this->getFlashData();
 		}
@@ -149,6 +150,7 @@ abstract class Piwik_ViewDataTable_GenerateGraphHTML extends Piwik_ViewDataTable
 			'swfLibraryPath'       => 'libs/swfobject/',
 			'requiredFlashVersion' => '9.0.0',
 			'isDataAvailable'      => $isDataAvailable,
+			'includeData'          => $this->includeData,
 			'data'                 => $this->chartData,
 		);
 	}

plugins/CoreHome/templates/graph.tpl

 <div id="{$properties.uniqueId}">
 	<div class="{if $graphType=='evolution'}dataTableGraphEvolutionWrapper{else}dataTableGraphWrapper{/if}">
 
-	{if $flashParameters.isDataAvailable}	
+	{if $flashParameters.isDataAvailable || !$flashParameters.includeData}
 		<div><div id="{$chartDivId}">
 			{'General_RequiresFlash'|translate} >= {$flashParameters.requiredFlashVersion}. <a target="_blank" href="misc/redirectToUrl.php?url={'http://piwik.org/faq/troubleshooting/#faq_53'|escape:"url"}">{'General_GraphHelp'|translate}</a>
 		</div></div>
@@ -14,7 +14,7 @@
 				"{$flashParameters.requiredFlashVersion}",
 				"{$flashParameters.swfLibraryPath}expressInstall.swf",
 				{literal}{{/literal}
-					"x-data-file":"{$urlGraphData|escape:"url"}",
+					"{if $flashParameters.includeData}x-{/if}data-file":"{$urlGraphData|escape:"url"}",
 					"loading":"{'General_Loading'|translate|escape:"html"}",
 					"id":"{$chartDivId}"
 				{literal}},
@@ -26,7 +26,9 @@
 					"bgcolor":"#FFFFFF"
 				{literal}}{/literal}
 			);
+			{if $flashParameters.includeData}
 			piwikHelper.OFC.set("{$chartDivId}", '{$flashParameters.data}');
+			{/if}
 //-->
 		</script>
 	{else}