5 files changed, 65 insertions, 40 deletions

diff --git a/core/DataFiles/SearchEngines.php b/core/DataFiles/SearchEngines.php
index 7239247aea..6fe13a10bc 100644
--- a/core/DataFiles/SearchEngines.php
+++ b/core/DataFiles/SearchEngines.php
@@ -50,7 +50,8 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
 
 		// 1und1
 		'portal.1und1.de'			=> array('1und1', 'search'),
-
+		'search.1und1.de'                       => array('1und1', 'su', 'search/web/?mc=suche%40web%40home.suche%40web&allparams=&smode=&su={k}&search=Suche&webRb='),
+	
 		// 3271
 		'nmsearch.3721.com'			=> array('3271', 'p'),
 		'seek.3721.com'				=> array('3271', 'p'),
@@ -334,7 +335,8 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
 		'antisearch.francite.com'	=> array('Francite', 'KEYWORDS'),
 
 		// Fireball
-		'suche.fireball.de'			=> array('Fireball', 'query'),
+		'suche.fireball.de'			=> array('Fireball', 'query'),   
+		'www.fireball.de'                       => array('Fireball', 'q'),
 
 		// Firstfind
 		'www.firstsfind.com'		=> array('Firstsfind', 'qry'),
@@ -344,7 +346,15 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
 
 		// Flix
 		'www.flix.de'				=> array('Flix.de', 'keyword'),
-
+                
+		// Forestle
+        'de.forestle.org'                               => array('Forestle', 'q', 'search.php?q={k}'),
+        'at.forestle.org'                               => array('Forestle', 'q', 'search.php?q={k}'),
+        'ch.forestle.org'                               => array('Forestle', 'q', 'search.php?q={k}'),
+        'us.forestle.org'                               => array('Forestle', 'q', 'search.php?q={k}'),
+        'fr.forestle.org'                               => array('Forestle', 'q', 'search.php?q={k}'),
+
+	
 		// Free
 		'search.free.fr'			=> array('Free', 'q'),
 		'search1-2.free.fr'			=> array('Free', 'q'),
@@ -1109,9 +1119,13 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
 		'search-dyn.tiscali.de'		=> array('Tiscali', 'key'),
 		'hledani.tiscali.cz'		=> array('Tiscali', 'query', false, 'windows-1250'),
 
-		// T-Online
+        // Tixuma
+		'www.tixuma.de'                         => array('Tixuma', 'sc', 'index.php?mp=search&stp=&sc={k}&tg=0'),
+	
+        // T-Online
 		'suche.t-online.de'			=> array('T-Online', 'q'),
-
+		'navigationshilfe.t-online.de'                  => array('T-Online', 'q', 'dtag/dns/results?mode=search_top&q={k}'),
+		
 		// Trouvez.com
 		'www.trouvez.com'			=> array('Trouvez.com', 'query'),
 
@@ -1193,7 +1207,9 @@ if(!isset($GLOBALS['Piwik_SearchEngines'] ))
 		'us.search.yahoo.com'		=> array('Yahoo!', 'p'),
 		'ru.search.yahoo.com'		=> array('Yahoo!', 'p'),
 		'www.yahoo.com.cn'			=> array('Yahoo!', 'p'),
+		'de.yhs.search.yahoo.com'       => array('Yahoo!', 'p', 'avg/search?p={k}'),
 
+	
 		'au.yhs.search.yahoo.com'	=> array('Yahoo!', 'p', 'avg/search?p={k}'),
 
 		'de.dir.yahoo.com'			=> array('Yahoo! Webverzeichnis', ''),
diff --git a/plugins/CoreHome/templates/graph.tpl b/plugins/CoreHome/templates/graph.tpl
index ff4f282a1b..487a7139b0 100644
--- a/plugins/CoreHome/templates/graph.tpl
+++ b/plugins/CoreHome/templates/graph.tpl
@@ -14,10 +14,10 @@
 				"{$flashParameters.requiredFlashVersion}",
 				"{$flashParameters.swfLibraryPath}expressInstall.swf",
 				{literal}{{/literal}
+					"{if $flashParameters.includeData}x-{/if}data-file":"{$urlGraphData|escape:"url"}",
 				{if $flashParameters.includeData}
 					"id":"{$chartDivId}",
 				{/if}
-					"{if $flashParameters.includeData}x-{/if}data-file":"{$urlGraphData|escape:"url"}",
 					"loading":"{'General_Loading'|translate|escape:"html"}"
 				{literal}},
 				{{/literal}
diff --git a/plugins/Dashboard/Controller.php b/plugins/Dashboard/Controller.php
index c778dab567..2e623863f1 100644
--- a/plugins/Dashboard/Controller.php
+++ b/plugins/Dashboard/Controller.php
@@ -21,7 +21,11 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 		$view = Piwik_View::factory($template);
 		$this->setGeneralVariablesView($view);
 
-		$view->layout = $this->getLayout();
+		$layout = $this->getLayout();
+		if(empty($layout)) {
+			$layout = $this->getDefaultLayout();
+		}
+		$view->layout = $layout;
 		$view->availableWidgets = json_encode(Piwik_GetWidgetsList());
 		return $view;
 	}
@@ -131,7 +135,12 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 			&& strstr($layout, '[[') == false) {
 			$layout = "'$layout'";
 		}
-		
+		$layout = $this->removeDisabledPluginFromLayout($layout);
+		return $layout;
+	}
+	
+	protected function removeDisabledPluginFromLayout($layout)
+	{
 		// if the json decoding works (ie. new Json format)
 		// we will only return the widgets that are from enabled plugins
 		if($layoutObject = json_decode($layout, $assoc = true)) 
@@ -140,10 +149,12 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 			{
 				foreach($row as $widgetId => $widget)
 				{
-					$pluginName = $widget['parameters']['module'];
-					if(!Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName))
-					{
-						unset($row[$widgetId]);
+					if(isset($widget->parameters->module)) {
+    					$pluginName = $widget->parameters->module;
+    					if(!Piwik_PluginsManager::getInstance()->isPluginActivated($pluginName))
+    					{
+    						unset($row[$widgetId]);
+    					}
 					}
 				}
 			}
@@ -151,6 +162,30 @@ class Piwik_Dashboard_Controller extends Piwik_Controller
 		}
 		return $layout;
 	}
+	
+	protected function getDefaultLayout()
+	{
+		$defaultLayout = '[
+    		[
+    			{"uniqueId":"widgetVisitsSummarygetEvolutionGraph","parameters":{"module":"VisitsSummary","action":"getEvolutionGraph","columns":["nb_visits"]}},
+    			{"uniqueId":"widgetVisitorInterestgetNumberOfVisitsPerVisitDuration","parameters":{"module":"VisitorInterest","action":"getNumberOfVisitsPerVisitDuration"}},
+    			{"uniqueId":"widgetUserSettingsgetBrowser","parameters":{"module":"UserSettings","action":"getBrowser"}},
+    			{"uniqueId":"widgetUserCountrygetCountry","parameters":{"module":"UserCountry","action":"getCountry"}},
+    			{"uniqueId":"widgetExampleFeedburnerfeedburner","parameters":{"module":"ExampleFeedburner","action":"feedburner"}}
+    		],
+    		[
+    			{"uniqueId":"widgetReferersgetKeywords","parameters":{"module":"Referers","action":"getKeywords"}},
+    			{"uniqueId":"widgetReferersgetWebsites","parameters":{"module":"Referers","action":"getWebsites"}}
+    		],
+    		[
+    			{"uniqueId":"widgetReferersgetSearchEngines","parameters":{"module":"Referers","action":"getSearchEngines"}},
+    			{"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}},
+    			{"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}}
+    		]
+    	]';
+		$defaultLayout = $this->removeDisabledPluginFromLayout($defaultLayout);
+		return $defaultLayout;
+	}
 }
 
 
diff --git a/plugins/Dashboard/templates/index.tpl b/plugins/Dashboard/templates/index.tpl
index faf0a11323..2ac7a0f26b 100644
--- a/plugins/Dashboard/templates/index.tpl
+++ b/plugins/Dashboard/templates/index.tpl
@@ -1,36 +1,12 @@
 {loadJavascriptTranslations plugins='CoreHome Dashboard'}
 
 <script type="text/javascript">
-{if !empty($layout) }
 	piwik.dashboardLayout = {$layout};
-{else}
-{literal}
-	piwik.dashboardLayout = 
-	[
-		[
-			{"uniqueId":"widgetVisitsSummarygetEvolutionGraph","parameters":{"module":"VisitsSummary","action":"getEvolutionGraph","columns":["nb_visits"]}},
-			{"uniqueId":"widgetVisitorInterestgetNumberOfVisitsPerVisitDuration","parameters":{"module":"VisitorInterest","action":"getNumberOfVisitsPerVisitDuration"}},
-			{"uniqueId":"widgetUserSettingsgetBrowser","parameters":{"module":"UserSettings","action":"getBrowser"}},
-			{"uniqueId":"widgetUserCountrygetCountry","parameters":{"module":"UserCountry","action":"getCountry"}},
-			{"uniqueId":"widgetExampleFeedburnerfeedburner","parameters":{"module":"ExampleFeedburner","action":"feedburner"}}
-		],
-		[
-			{"uniqueId":"widgetReferersgetKeywords","parameters":{"module":"Referers","action":"getKeywords"}},
-			{"uniqueId":"widgetReferersgetWebsites","parameters":{"module":"Referers","action":"getWebsites"}}
-		],
-		[
-			{"uniqueId":"widgetReferersgetSearchEngines","parameters":{"module":"Referers","action":"getSearchEngines"}},
-			{"uniqueId":"widgetVisitTimegetVisitInformationPerServerTime","parameters":{"module":"VisitTime","action":"getVisitInformationPerServerTime"}},
-			{"uniqueId":"widgetExampleRssWidgetrssPiwik","parameters":{"module":"ExampleRssWidget","action":"rssPiwik"}}
-		]
-	];
-{/literal}
 	{*
 	the old dashboard layout style is:
 	piwik.dashboardLayout = 'VisitsSummary.getEvolutionGraph~VisitorInterest.getNumberOfVisitsPerVisitDuration~UserSettings.getBrowser~ExampleFeedburner.feedburner|Referers.getKeywords~Referers.getWebsites|Referers.getSearchEngines~VisitTime.getVisitInformationPerServerTime~ExampleRssWidget.rssPiwik|';
 	*}
-{/if}
-piwik.availableWidgets = {$availableWidgets};
+	piwik.availableWidgets = {$availableWidgets};
 </script>
 
 {literal}
diff --git a/plugins/Widgetize/templates/widgetize.js b/plugins/Widgetize/templates/widgetize.js
index 46382eacbe..f596c4bbb8 100644
--- a/plugins/Widgetize/templates/widgetize.js
+++ b/plugins/Widgetize/templates/widgetize.js
@@ -67,9 +67,8 @@ function widgetize()
 			'</div>'
 		);
 		
-		// Add the Flash Export if a flash <embed> is found in the widget 
-		// 0.5: removing temporarily this feature as it seems not working
 		if(false) {
+			// Add the Flash Export if a flash <embed> is found in the widget 
 			$(loadedWidgetElement)
 				.find('embed,object')
 				.each(function() {
@@ -88,7 +87,6 @@ function widgetize()
 					);
 				});
 		}
-		
 		// 0.5: Removing launchpad feature as it doesn't seem to work well despite us contacting Clearspring
 		if(false) {
 			$(exportButtonsElement).append(