1 files changed, 36 insertions, 66 deletions
diff --git a/index.php b/index.php
index dac0db036..708e38ec9 100644
--- a/index.php
+++ b/index.php
@@ -1,66 +1,36 @@
-<?php
-
-	elgg_set_context('custom_index_widgets');
-	elgg_set_page_owner_guid(elgg_get_config('site_guid'));
-	
-	$widgettypes = elgg_get_widget_types(); 
-
-	$page_owner = elgg_get_page_owner_guid();
-	$ciw_layout = elgg_get_plugin_setting("ciw_layout", "custom_index_widgets");
-	$ciw_showdashboard = elgg_get_plugin_setting("ciw_showdashboard", "custom_index_widgets");
-
-	$customwidgets = elgg_get_widgets($page_owner, elgg_get_context()); 
-	$area1widgets = isset($customwidgets[1]) ? $customwidgets[1] : FALSE;
-	$area2widgets = isset($customwidgets[2]) ? $customwidgets[2] : FALSE;
-	$area3widgets = isset($customwidgets[3]) ? $customwidgets[3] : FALSE;
-	/*
-	$area1widgets = elgg_get_widgets($page_owner,elgg_get_context(),1);
-	$area2widgets = elgg_get_widgets($page_owner,elgg_get_context(),2);
-	$area3widgets = elgg_get_widgets($page_owner,elgg_get_context(),3);
-	*/
-	
-	if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
-		
-		if (isset($vars['area3'])) $vars['area1'] = $vars['area3'];
-		if (isset($vars['area4'])) $vars['area2'] = $vars['area4'];
-	}
-	
-	$leftcolumn_widgets_view = custom_index_build_columns($area1widgets,$widgettypes);
-	$middlecolumn_widgets_view = custom_index_build_columns($area2widgets,$widgettypes);
-	$rightcolumn_widgets_view = custom_index_build_columns($area3widgets,$widgettypes);
-	
-		
-  	$content =  elgg_view_layout($ciw_layout, array('area1' => $leftcolumn_widgets_view,'area2' => $middlecolumn_widgets_view,'area3' => $rightcolumn_widgets_view, 'layoutmode' => 'index_mode') );
-	
-  	if (elgg_is_logged_in() && $ciw_showdashboard=="yes"){
-    
-		$user_guid = elgg_get_logged_in_user_guid();
-		elgg_set_page_owner_guid($user_guid);
-    	elgg_set_context('dashboard');
-		
-		
-		$dashboardwidgets = elgg_get_widgets($user_guid, elgg_get_context()); 
-		$area1widgets = isset($dashboardwidgets[1]) ? $dashboardwidgets[1] : FALSE;
-		$area2widgets = isset($dashboardwidgets[2]) ? $dashboardwidgets[2] : FALSE;
-		$area3widgets = isset($dashboardwidgets[3]) ? $dashboardwidgets[3] : FALSE;
-		/*
-    	$area1widgets = elgg_get_widgets($user_guid,elgg_get_context(),1);
-		$area2widgets = elgg_get_widgets($user_guid,elgg_get_context(),2);
-		$area3widgets = elgg_get_widgets($user_guid,elgg_get_context(),3);
-		*/
-		if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) {
-			
-			if (isset($vars['area3'])) $vars['area1'] = $vars['area3'];
-			if (isset($vars['area4'])) $vars['area2'] = $vars['area4'];
-			
-		}
-		
-		$leftcolumn_widgets_view = custom_index_build_columns($area1widgets,$widgettypes);
-		$middlecolumn_widgets_view = custom_index_build_columns($area2widgets,$widgettypes);
-		$rightcolumn_widgets_view = custom_index_build_columns($area3widgets,$widgettypes);
-		
-		$content  .= elgg_view_layout($ciw_layout, array('area1' => $leftcolumn_widgets_view,'area2' => $middlecolumn_widgets_view,'area3' => $rightcolumn_widgets_view, 'layoutmode' => 'index_mode') );
-    }
-	
-	echo elgg_view_page('Index', $content);
-?>
-\ No newline at end of file
+<?php
+/**
+ * Elgg index page for web-based applications
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+/**
+ * Start the Elgg engine
+ */
+require_once(dirname(__FILE__) . "/engine/start.php");
+
+elgg_set_context('main');
+
+// allow plugins to override the front page (return true to stop this front page code)
+if (elgg_trigger_plugin_hook('index', 'system', null, FALSE) != FALSE) {
+	exit;
+}
+
+if (elgg_is_logged_in()) {
+	forward('activity');
+}
+
+
+$content = elgg_view_title(elgg_echo('content:latest'));
+$content .= elgg_list_river();
+
+$login_box = elgg_view('core/account/login_box');
+
+$params = array(
+		'content' => $content,
+		'sidebar' => $login_box
+);
+$body = elgg_view_layout('one_sidebar', $params);
+echo elgg_view_page(null, $body);