1 files changed, 25 insertions, 24 deletions

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 767d6ce8ca..2c63abbc7c 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -16,37 +16,38 @@
  */
 class Piwik_CoreAdminHome_Controller extends Piwik_Controller
 {
-	function getDefaultAction()
+	public function index()
 	{
-		return 'redirectToIndex';
-	}
-	
-	function redirectToIndex()
-	{
-		if(Piwik::isUserIsSuperUser()) 
-		{
-			$module = 'CorePluginsAdmin';
-		} 
-		else 
-		{
-			$module = 'SitesManager';
-		}
-		header("Location:index.php?module=" . $module);
+		return $this->redirectToIndex('UsersManager', 'userSettings');
 	}
 
-	public function index()
+	public function generalSettings()
 	{
-		Piwik::checkUserIsSuperUser();
-		$view = $this->getDefaultIndexView();
+		$view = Piwik_View::factory('generalSettings');
+		$view->enableBrowserTriggerArchiving = Piwik_ArchiveProcessing::isBrowserTriggerArchivingEnabled();
+		$view->todayArchiveTimeToLive = Piwik_ArchiveProcessing::getTodayArchiveTimeToLive();
+		
+		$this->setGeneralVariablesView($view);
+		$view->menu = Piwik_GetAdminMenu();
 		echo $view->render();
 	}
 	
-	protected function getDefaultIndexView()
+	public function setGeneralSettings()
 	{
-		$view = Piwik_View::factory('index');
-		$view->content = '';
-		$this->setGeneralVariablesView($view);
-		$view->menu = Piwik_GetAdminMenu();
-		return $view;
+		$response = new Piwik_API_ResponseBuilder(Piwik_Common::getRequestVar('format'));
+		try {
+    		Piwik::checkUserIsSuperUser();
+    		$this->checkTokenInUrl();
+    		$enableBrowserTriggerArchiving = Piwik_Common::getRequestVar('enableBrowserTriggerArchiving');
+    		$todayArchiveTimeToLive = Piwik_Common::getRequestVar('todayArchiveTimeToLive');
+
+    		Piwik_ArchiveProcessing::setBrowserTriggerArchiving((bool)$enableBrowserTriggerArchiving);
+    		Piwik_ArchiveProcessing::setTodayArchiveTimeToLive($todayArchiveTimeToLive);
+			$toReturn = $response->getResponse();
+		} catch(Exception $e ) {
+			$toReturn = $response->getResponseException( $e );
+		}
+		echo $toReturn;
 	}
+	
 }