1 files changed, 36 insertions, 73 deletions
diff --git a/index.php b/index.php
index ae8dc5e51..708e38ec9 100644
--- a/index.php
+++ b/index.php
@@ -1,73 +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
-	 * @link http://elgg.org/
-	 */
-
-	/**
-	 * Start the Elgg engine
-	 */
-		require_once(dirname(__FILE__) . "/engine/start.php");
-
-	/**
-	 * Load the front page
-	 */
-		echo page_draw(null, elgg_view("homepage"));
-
-		get_objects(3,"blog","mammals","are lovely", 7, 2, 1);
-		
-		$obj = new stdClass;
-		$obj->id = 3;
-		
-		
-		
-		
-		// Testing ///////
-	
-		// Create / load a site
-		$site = get_site(1);
-		if (!$site)
-		{
-			$site = new ElggSite();
-			
-			$site->title = "Test title";
-			$site->description = "Test description";
-			$site->url = "http://dushka/~icewing/Workingdirectory/elggnew/";
-			$site->owner_id = 1;
-			$site->access_id = 0;
-			
-			error_log("LOADED NEW SITE: Saving");
-			
-			$site->save();
-		}
-		else
-			$site = new ElggSite($site);
-			
-		
-		
-
-		// annotate site
-
-
-		// add meta data
-
-
-		// get site 
-
-		// get site metadata
-		// change site metadata
-
-		// get site metadata
-
-
-		// get site annotations
-		
-		
-?>
-\ 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);