From 3d263ce6c814e64a2e153804936b30b908c0eee4 Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Sat, 28 May 2016 02:26:25 +0200
Subject: [PATCH] fixed register - dont allow second account, fixed redirect
 after register

---
 mojotrollz/page/default_beta/tpl/beta_loggedin.tpl        | 2 +-
 mojotrollz/page/default_beta/tpl/beta_loggedout.tpl       | 2 +-
 mojotrollz/page/default_register/default_register.php     | 4 +++-
 mojotrollz/page/default_register/js/default_register.js   | 2 +-
 mojotrollz/page/default_register/tpl/default_register.tpl | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
index 46d8e82..4fe6d38 100644
--- a/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
+++ b/mojotrollz/page/default_beta/tpl/beta_loggedin.tpl
@@ -8,7 +8,7 @@
         <p>
             <b>Realmlist: </b><a href="./api.php?call=files&cat=server&id=realmlist.wtf" target="blank">set realmlist mojotrollz.eu</a>
             <br>
-            <b>Client: </b><a href="${link_wow_2_4_3}" target="blank">${mojotrollz_wow_2_4_3}</a>
+            <b>Client: </b><a href="${link_wow_2_4_3}">${mojotrollz_wow_2_4_3}</a>
         </p>
     </div>
 </div>
diff --git a/mojotrollz/page/default_beta/tpl/beta_loggedout.tpl b/mojotrollz/page/default_beta/tpl/beta_loggedout.tpl
index 083e793..eadceb7 100644
--- a/mojotrollz/page/default_beta/tpl/beta_loggedout.tpl
+++ b/mojotrollz/page/default_beta/tpl/beta_loggedout.tpl
@@ -8,7 +8,7 @@
         <p>
             <b>Realmlist: </b><a href="./api.php?call=files&cat=server&id=realmlist.wtf" target="blank">set realmlist mojotrollz.eu</a>
             <br>
-            <b>Client: </b><a href="${link_wow_2_4_3}" target="blank">${mojotrollz_wow_2_4_3}</a>
+            <b>Client: </b><a href="${link_wow_2_4_3}">${mojotrollz_wow_2_4_3}</a>
         </p>
         <button id="btn_beta" class="btn btn-success btn-lg" style="width: 95%;">Join the Mojotribe</button>
     </div>
diff --git a/mojotrollz/page/default_register/default_register.php b/mojotrollz/page/default_register/default_register.php
index 205cb0d..09ddca4 100644
--- a/mojotrollz/page/default_register/default_register.php
+++ b/mojotrollz/page/default_register/default_register.php
@@ -7,7 +7,9 @@ class default_register extends \SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();
         $vars = array_merge($vars,\SYSTEM\PAGE\text::tag('mojotrollz'));
-        return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_register/tpl/default_register.tpl'))->SERVERPATH(), $vars);
+        return \SYSTEM\PAGE\replace::replaceFile(   \SYSTEM\SECURITY\Security::isLoggedIn() ?
+                                                    (new PPAGE('default_register/tpl/register_loggedin.tpl'))->SERVERPATH() :
+                                                    (new PPAGE('default_register/tpl/default_register.tpl'))->SERVERPATH(), $vars);
     }
     public static function js(){
         return array(   new PPAGE('default_register/js/default_register.js'),
diff --git a/mojotrollz/page/default_register/js/default_register.js b/mojotrollz/page/default_register/js/default_register.js
index 89769b8..179c4c7 100644
--- a/mojotrollz/page/default_register/js/default_register.js
+++ b/mojotrollz/page/default_register/js/default_register.js
@@ -20,7 +20,7 @@ function init_register(){
                     data: register_data,
                     success: function (data) {
                         if(data.status){ // reload -> user will be loged in
-                            location.reload();
+                            system.load('beta');
                         }else{  // show errors
                             $('.help-block').html(data.result.message);
                         }
diff --git a/mojotrollz/page/default_register/tpl/default_register.tpl b/mojotrollz/page/default_register/tpl/default_register.tpl
index bd82cde..2247bd8 100644
--- a/mojotrollz/page/default_register/tpl/default_register.tpl
+++ b/mojotrollz/page/default_register/tpl/default_register.tpl
@@ -1,6 +1,6 @@
 <div class="row-fluid">
     <div class="col-md-12">
-        <h2>Mojotrollz Beta Register Form</h2>
+        <h2>Mojotrollz Beta - Register Form</h2>
         <br><br>
         <form class="textbox" id="register_user_form">
             <div class="control-group" id="register_username_control_group">