1 files changed, 36 insertions, 44 deletions
diff --git a/index.php b/index.php
index 305d713a8..708e38ec9 100644
--- a/index.php
+++ b/index.php
@@ -1,44 +1,36 @@
-<?php
-
-	/**
-	 * Elgg index page for web-based applications
-	 * 
-	 * @package Elgg
-	 * @subpackage Core
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd
-	 * @copyright Curverider Ltd 2008-2009
-	 * @link http://elgg.org/
-	 */
-
-	/**
-	 * Start the Elgg engine
-	 */
-		define('externalpage',true);
-		require_once(dirname(__FILE__) . "/engine/start.php");
-		
-		
-		if (!trigger_plugin_hook('index','system',null,false)) {
-	
-			/**
-		      * Check to see if user is logged in, if not display login form
-		      **/
-				
-				if (isloggedin()) forward('pg/dashboard/');
-			
-	        //Load the front page
-	        	global $CONFIG;
-	        	$title = elgg_view_title(elgg_echo('content:latest'));
-	        	set_context('search');
-		        $content = list_registered_entities(0,10,true,false,array('object','group'));
-		        set_context('main');
-		        global $autofeed;
-		        $autofeed = false;
-		        $content = elgg_view_layout('two_column_left_sidebar', '', $title . $content, elgg_view("account/forms/login"));
-		        page_draw(null, $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);