diff options
| author | Philip Häusler <msquare@notrademark.de> | 2011-09-14 22:19:10 +0200 |
|---|---|---|
| committer | Philip Häusler <msquare@notrademark.de> | 2011-09-14 22:19:10 +0200 |
| commit | fc90174dd8d7ff4417af478b3ee60646443488f9 (patch) | |
| tree | 7f03daba84bc9bfbbe9e1e9be3c31a23e60cbbf8 /includes | |
| parent | 0eb9830818d935b0dc3e57eea49924e3b4ca18a0 (diff) | |
joined login+start
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/pages/guest_login.php | 6 | ||||
| -rw-r--r-- | includes/pages/guest_start.php | 11 | ||||
| -rw-r--r-- | includes/sys_menu.php | 1 |
3 files changed, 7 insertions, 11 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", |