joined login+start

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")
 	));
 }
 ?>

includes/pages/guest_start.php

@@ -1,13 +1,6 @@
 <?php
 function guest_start() {
-	require_once ('includes/pages/guest_login.php');
+	header("Location: ?p=login");
-	$html = "<p>" . Get_Text("index_text1") . "</p>\n";
+	die();
-	$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;
 }
 ?>

includes/sys_menu.php

@@ -12,7 +12,6 @@ function make_navigation() {
 
 	// Standard Navigation
 	$menu .= make_navigation_for(Get_Text('/'), array (
-		"start",
 		"login",
 		"logout",
 		"register",

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'];
 

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>
+</form>
+<p>
+    %text4%
+</p>