From fc90174dd8d7ff4417af478b3ee60646443488f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Wed, 14 Sep 2011 22:19:10 +0200
Subject: [PATCH] joined login+start

---
 includes/pages/guest_login.php  |  6 +++++-
 includes/pages/guest_start.php  | 11 ++---------
 includes/sys_menu.php           |  1 -
 public/index.php                |  2 +-
 templates/guest_login_form.html | 14 +++++++++++++-
 5 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/includes/pages/guest_login.php b/includes/pages/guest_login.php
index 30dbaf55..51afd9c5 100644
--- a/includes/pages/guest_login.php
+++ b/includes/pages/guest_login.php
@@ -237,7 +237,11 @@ function guest_login_form() {
 		'link' => page_link_to("login"),
 		'nick' => Get_Text("index_lang_nick"),
 		'pass' => Get_Text("index_lang_pass"),
-		'send' => Get_Text("index_lang_send")
+		'send' => Get_Text("index_lang_send"),
+		'text1' => Get_Text("index_text1"),
+		'text2' => Get_Text("index_text2"),
+		'text3' => Get_Text("index_text3"),
+		'text4' => Get_Text("index_text4")
 	));
 }
 ?>
diff --git a/includes/pages/guest_start.php b/includes/pages/guest_start.php
index 286511f2..efad0a24 100644
--- a/includes/pages/guest_start.php
+++ b/includes/pages/guest_start.php
@@ -1,13 +1,6 @@
 <?php
 function guest_start() {
-	require_once ('includes/pages/guest_login.php');
-	$html = "<p>" . Get_Text("index_text1") . "</p>\n";
-	$html .= "<p>" . Get_Text("index_text2") . "</p>\n";
-	$html .= "<p>" . Get_Text("index_text3") . "</p>\n";
-
-	$html .= guest_login_form();
-
-	$html .= "<h6>" . Get_Text("index_text4") . "</h6>";
-	return $html;
+	header("Location: ?p=login");
+	die();
 }
 ?>
\ No newline at end of file
diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 38c53904..b1a4d53d 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -12,7 +12,6 @@ function make_navigation() {
 
 	// Standard Navigation
 	$menu .= make_navigation_for(Get_Text('/'), array (
-		"start",
 		"login",
 		"logout",
 		"register",
diff --git a/public/index.php b/public/index.php
index 22a139ef..2a5a273b 100644
--- a/public/index.php
+++ b/public/index.php
@@ -27,7 +27,7 @@ if (isset ($_REQUEST['auth']))
 	json_auth_service();
 
 // Gewünschte Seite/Funktion
-$p = isset ($user) ? "news" : "start";
+$p = isset ($user) ? "news" : "login";
 if (isset ($_REQUEST['p']) && preg_match("/^[a-z0-9_]*$/i", $_REQUEST['p']) && sql_num_query("SELECT * FROM `Privileges` WHERE `name`='" . sql_escape($_REQUEST['p']) . "' LIMIT 1") > 0)
 	$p = $_REQUEST['p'];
 
diff --git a/templates/guest_login_form.html b/templates/guest_login_form.html
index c0cef263..ded06636 100644
--- a/templates/guest_login_form.html
+++ b/templates/guest_login_form.html
@@ -1,3 +1,12 @@
+<p>
+    %text1%
+</p>
+<p>
+    %text2%
+</p>
+<p>
+    %text3%
+</p>
 <form action="%link%" method="post">
     <table>
         <tr>
@@ -19,4 +28,7 @@
     </table>
     <br/>
     <input type="submit" name="login_submit" value="%send%">
-</form>
\ No newline at end of file
+</form>
+<p>
+    %text4%
+</p>