From f423fbbf881a9ed2b652004e378b0b9739c41025 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 29 Dec 2015 01:19:26 +0100
Subject: [PATCH] few smaler fixes

---
 mojotrollz/page/default_beta/default_beta.php          |  2 +-
 mojotrollz/page/default_beta/tpl/beta_loggedin.tpl     |  3 ++-
 .../saimod_mojotrollz_beta/sql/qq/BETA_USE_CODE.php    |  2 +-
 mojotrollz/sql/mysql/system_page.sql                   | 10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mojotrollz/page/default_beta/default_beta.php b/mojotrollz/page/default_beta/default_beta.php
index 5683dad..bcc1f40 100644
--- a/mojotrollz/page/default_beta/default_beta.php
+++ b/mojotrollz/page/default_beta/default_beta.php
@@ -6,7 +6,7 @@ class default_beta extends \SYSTEM\PAGE\Page {
     public function html(){
         if(!\SAI\saimod_mojotrollz_beta::code_check($this->key)){
             $vars = \SYSTEM\PAGE\text::tag('mojotrollz');
-            $vars['invalid_key'] = $this->key ? '<p><font color="red">Your key is invalid or already in use!</font></p>' : '';
+            $vars['invalid_key'] = ($this->key && !\SYSTEM\SECURITY\Security::isLoggedIn()) ? '<p><font color="red">Your key is invalid or already in use!</font></p>' : '';
             $vars['beta_area'] =    \SYSTEM\SECURITY\Security::isLoggedIn() ?
                                     \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_loggedin.tpl'), array('email' => \SYSTEM\SECURITY\Security::getUser()->email)) :
                                     \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_beta/tpl/beta_loggedout.tpl'));
diff --git a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
index 20fd5b9..a3790d7 100644
--- a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
+++ b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
@@ -1,3 +1,4 @@
 <div class="col-md-3">
-    You are logged in as ${email}
+    You are part of the Beta! <br>
+    You are logged in as <b>${email}</b>
 </div>
\ No newline at end of file
diff --git a/mojotrollz/sai/saimod_mojotrollz_beta/sql/qq/BETA_USE_CODE.php b/mojotrollz/sai/saimod_mojotrollz_beta/sql/qq/BETA_USE_CODE.php
index 4770dc2..2b93e89 100644
--- a/mojotrollz/sai/saimod_mojotrollz_beta/sql/qq/BETA_USE_CODE.php
+++ b/mojotrollz/sai/saimod_mojotrollz_beta/sql/qq/BETA_USE_CODE.php
@@ -3,6 +3,6 @@ namespace SQL;
 class BETA_USE_CODE extends \SYSTEM\DB\QP {
     public static function get_class(){return \get_class();}
     public static function mysql(){return
-'UPDATE mojotrollz_beta SET user_new = ?  WHERE code = ?;';
+'UPDATE mojotrollz_beta SET user_new = ?, date_redeemed = NOW() WHERE code = ?;';
     }    
 }
\ No newline at end of file
diff --git a/mojotrollz/sql/mysql/system_page.sql b/mojotrollz/sql/mysql/system_page.sql
index 523c7cd..22ced30 100644
--- a/mojotrollz/sql/mysql/system_page.sql
+++ b/mojotrollz/sql/mysql/system_page.sql
@@ -1,8 +1,8 @@
-INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (10, 1, 'start', 'start', -1, 0, 0, '#content', './?page=start', 'init_start', 'default_start');
-INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 1, 'serverlist', 'start', 10, 0, 0, '#content_servers', './?page=serverlist', 'init_serverlist', 'default_serverlist');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (10, 1, 'start', 'start', -1, 0, 0, '#content', './?page=start', 'init_start', 'default_start');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (11, 1, 'serverlist', 'start', 10, 0, 0, '#content_servers', './?page=serverlist', 'init_serverlist', 'default_serverlist');
 
-INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (15, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (15, 1, 'impressum', 'impressum', -1, 0, 0, '#content', './?page=impressum', 'init_impressum', 'default_impressum');
 
-INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'login', 'login', -1, 0, 0, '#content', './?page=login', 'init_login', 'default_login');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (20, 1, 'login', 'login', -1, 0, 0, '#content', './?page=login', 'init_login', 'default_login');
 
-INSERT INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta&key=${key}', 'init_beta', 'default_beta');
+REPLACE INTO `system_page` (`id`, `group`, `name`, `state`, `parent_id`, `login`, `type`, `div`, `url`, `func`, `php_class`) VALUES (25, 1, 'beta', 'beta', -1, 0, 0, '#content', './?page=beta&key=${key}', 'init_beta', 'default_beta');