- fixing bug in testing suite (now dropping the right DB)

- favicon in all UI
- fixing #398 Feedburner widget should save the data per website!

2 files changed, 9 insertions, 4 deletions

diff --git a/plugins/ExampleFeedburner/ExampleFeedburner.php b/plugins/ExampleFeedburner/ExampleFeedburner.php
index e1491fdbf3..498c6ec222 100644
--- a/plugins/ExampleFeedburner/ExampleFeedburner.php
+++ b/plugins/ExampleFeedburner/ExampleFeedburner.php
@@ -45,13 +45,15 @@ class Piwik_ExampleFeedburner_Controller extends Piwik_Controller
 	function feedburner()
 	{
 		$view = new Piwik_View('ExampleFeedburner/feedburner.tpl');
+		$idSite = Piwik_Common::getRequestVar('idSite',1,'int');
 		$feedburnerFeedName = Piwik_FetchOne('SELECT feedburnerName FROM '.Piwik::prefixTable('site').
-								' WHERE idsite = ?', Piwik_Common::getRequestVar('idSite',1,'int') );
+								' WHERE idsite = ?', $idSite );
 		if(empty($feedburnerFeedName))
 		{
 			$feedburnerFeedName = 'Piwik';
 		}
 		$view->feedburnerFeedName = $feedburnerFeedName;
+		$view->idSite = $idSite;
 		echo $view->render();
 	}
 	
@@ -64,7 +66,8 @@ class Piwik_ExampleFeedburner_Controller extends Piwik_Controller
 		// we save the value in the DB for an authenticated user
 		if(Piwik::getCurrentUserLogin() != 'anonymous')
 		{
-			Piwik_Query('UPDATE '.Piwik::prefixTable('site').' SET feedburnerName = ? WHERE idsite = ?', 
+			Piwik_Query('UPDATE '.Piwik::prefixTable('site').' 
+						 SET feedburnerName = ? WHERE idsite = ?', 
 				array(Piwik_Common::getRequestVar('name','','string'), Piwik_Common::getRequestVar('idSite',1,'int'))
 				);
 		}
diff --git a/plugins/ExampleFeedburner/feedburner.tpl b/plugins/ExampleFeedburner/feedburner.tpl
index c3673bf529..dd59dd0379 100644
--- a/plugins/ExampleFeedburner/feedburner.tpl
+++ b/plugins/ExampleFeedburner/feedburner.tpl
@@ -1,6 +1,8 @@
 

-{literal}

 <script type="text/javascript">

+	var idSite = {$idSite};

+

+{literal}

 	$(document).ready(function(){ 

 	

 	function getName()

@@ -17,7 +19,7 @@
 	

 	$("#feedburnerSubmit").click( function(){

 		var feedburnerName = getName();

-		$.get('?module=ExamplePlugin&action=saveFeedburnerName&name='+feedburnerName);

+		$.get('?module=ExampleFeedburner&action=saveFeedburnerName&idSite='+idSite+'&name='+feedburnerName);

 		loadIframe();

 		

 	});