From bb83abafad986c3f4fc9135614a250e79f5ed3a4 Mon Sep 17 00:00:00 2001
From: Aaron Junker <aaron.junker@sus.schulen-stadtsh.ch>
Date: Mon, 14 Sep 2020 18:27:51 +0200
Subject: [PATCH] push

---
 CHANGELOG.md                            |  31 +++-
 README.md                               |   2 +-
 SECURITY.md                             |   2 +-
 site/admin/index.php                    |   4 +-
 site/admin/pages/about.php              |   2 +-
 site/changepassword.php                 |   2 +-
 site/includes/class.inc.php             |  16 +-
 site/includes/getErrorSite.inc.php      |   4 +-
 site/includes/getLang.inc.php           |   4 +-
 site/includes/getProfilePicture.inc.php |   4 +-
 site/includes/getSetting.inc.php        |   4 +-
 site/install/index.php                  |   1 +
 site/lang/en-en.json                    |  17 ++-
 site/login.php                          |  50 +++---
 site/logout.php                         |   9 +-
 site/{profil.php => profile.php}        | 193 ++++++++++++------------
 site/register.php                       |  10 +-
 17 files changed, 200 insertions(+), 155 deletions(-)
 rename site/{profil.php => profile.php} (80%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0babb83f..8a7e22e15 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,15 +1,30 @@
-# Pb2.0Bfx0
+# Pb2.0Bfx0RCA
+> This Version isn't backward compatible to older versions
+
+> The install wizard doesn't work.
+
+This is a release Candidate version. Issues will be tracked in #49
+
+## Additions
 * Added better class system
-* Better organisation of code
 * Added HTTP-Errors 400, 405, 410, 414, 423
-* Updated files to new code conventions
+* Added experimental information to installer.
+## Changes
+* Better organisation of code
+* Renamed profil.php in profile.php
+* Added more documentation to code
+* Moved blogsite, index and HTTP-Errors to page.php
 * Added all translations
+* Updated files to new code conventions
+## Removed
 * Removed is_there_usoc.json
-* Added more documentation
-* Moved HTTP-Errors to page.php
-* Moved index page to normal pages.
-* Moved blogsite to page.php
-* fixed #48
+* /errors/*
+* blog.php
+* blogsite.php
+* option for a hash
+## Fixed bugs
+* #48
+* And other
 # Pb1.8Bfx0
 * Fixed #43, #28 and other bugs.
 # Pb1.7Bfx1
diff --git a/README.md b/README.md
index 4c6e8907a..49d2900be 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c5f474aa55e4eb1a63729a4692aaf90)](https://www.codacy.com/gh/Case-Games/USOC?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=Case-Games/USOC&amp;utm_campaign=Badge_Grade)
 Useful simple open-source CMS
 
-![](https://img.shields.io/badge/Version%20in%20developement%20in%20this%20branch-Pb2.0Bfx0-blue)
+![](https://img.shields.io/badge/Version%20in%20developement%20in%20this%20branch-Pb2.0Bfx0RCA-blue)
 # Is it ready to use
 No. In the moment you shouldn't use it
 # How can I help
diff --git a/SECURITY.md b/SECURITY.md
index 13b737a99..989aed0f4 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,7 +9,7 @@ Old pre-alpha and pre-beta versions aren't supported with bugfixes.
 ### Pre-Beta
 | Version | Supported|Newest Version|
 | ------- | ---------|--------------|
-| Pb2.0   | :x:      | Pb2.0Bfx0    |
+| Pb2.0   | :x:      | Pb2.0Bfx0RCA    |
 | Pb1.8   | :x:      | Pb1.8Bfx0    |
 | Pb1.7   | :x:      | Pb1.7Bfx1    |
 | Pb1.6   | :x:      | Pb1.6Bfx0    |
diff --git a/site/admin/index.php b/site/admin/index.php
index 8d0e21c2c..b96f9d79e 100644
--- a/site/admin/index.php
+++ b/site/admin/index.php
@@ -26,9 +26,9 @@
   }else{
     ?>
       <form action="login.php" method="post">
-        <label for="B"><?php echo $U->getLang("login.username") ?></label>
+        <label for="B"><?php echo $U->getLang("login.username.g") ?></label>
         <input name="B" type="text" />
-        <label for="P"><?php echo $U->getLang("login.password") ?></label>
+        <label for="P"><?php echo $U->getLang("login.password.g") ?></label>
         <input name="P" type="password" />
         <input type="submit" />
       </form>
diff --git a/site/admin/pages/about.php b/site/admin/pages/about.php
index 9e543751f..867d874e2 100644
--- a/site/admin/pages/about.php
+++ b/site/admin/pages/about.php
@@ -13,7 +13,7 @@
     <a href="<?php echo $_SERVER['PHP_SELF']; ?>?URL=mainpage">Back</a>
     <h1>USOC</h1>
     <h2>Useful Simple Open-source CMS</h2>
-    <p><?php echo $U->getLang("admin.about.version") ?>: Pb2.0Bfx0</p>
+    <p><?php echo $U->getLang("admin.about.version") ?>: Pb2.0Bfx0RCA</p>
     <p><?php echo $U->getLang("admin.about.license") ?></p>
     <p>By Case Games 2020</p>
     <p><?php echo $U->getLang("admin.about.developed_by") ?></p>
diff --git a/site/changepassword.php b/site/changepassword.php
index b7fc9b674..8e66023c6 100644
--- a/site/changepassword.php
+++ b/site/changepassword.php
@@ -5,7 +5,7 @@
   newClass();
 ?>
 <!DOCTYPE html>
-<html lang="<?php echo $U->getSetting("site.lang"); ?> dir="ltr">
+<html lang="<?php echo $U->getSetting("site.lang"); ?>" dir="ltr">
   <head>
     <?php
       include_once "siteelements/head.php";
diff --git a/site/includes/class.inc.php b/site/includes/class.inc.php
index dfd3cb44c..83b4a0044 100644
--- a/site/includes/class.inc.php
+++ b/site/includes/class.inc.php
@@ -9,8 +9,8 @@
   if(gettype($USOC) == "array"){
     /**
     * This function initialise the U class in $U if it doesn't exist
-    * @version Pb2.0Bfx0
-    * @since Pb2.0Bfx0
+    * @version Pb2.0Bfx0RCA
+    * @since Pb2.0Bfx0RCA
     */
     function newClass(){
       global $U;
@@ -21,25 +21,25 @@ function newClass(){
     * This class only works when configuration.php is included.
     * Use newClass() and not this class.
     * @see newClass()
-    * @version Pb2.0Bfx0
-    * @since Pb2.0Bfx0
+    * @version Pb2.0Bfx0RCA
+    * @since Pb2.0Bfx0RCA
     */
     class U{
       /**
       * Version name.
-      * @since Pb2.0Bfx0
+      * @since Pb2.0Bfx0RCA
       * @var string
       */
-      public $version = "Pb2.0Bfx0";
+      public $version = "Pb2.0Bfx0RCA";
       /**
       * Version code
-      * @since Pb2.0Bfx0
+      * @since Pb2.0Bfx0RCA
       * @var int
       */
       public $version_code = 20200900;
       /**
       * True when USOC is modded.
-      * @since Pb2.0Bfx0
+      * @since Pb2.0Bfx0RCA
       * @var boolean
       */
       public $modded = false;
diff --git a/site/includes/getErrorSite.inc.php b/site/includes/getErrorSite.inc.php
index cb931670f..86fc87c91 100644
--- a/site/includes/getErrorSite.inc.php
+++ b/site/includes/getErrorSite.inc.php
@@ -8,8 +8,8 @@
   * This function return the code for the Error Page with error $error
   * When it can't find the string in the default language it searches the string in en-en
   * @see U For more informations about U.
-  * @version Pb2.0Bfx0
-  * @since Pb2.0Bfx0
+  * @version Pb2.0Bfx0RCA
+  * @since Pb2.0Bfx0RCA
   * @param string $error String with the error (example: "404")
   * @return string The code
   */
diff --git a/site/includes/getLang.inc.php b/site/includes/getLang.inc.php
index 19a01f1a7..03509558d 100644
--- a/site/includes/getLang.inc.php
+++ b/site/includes/getLang.inc.php
@@ -8,8 +8,8 @@
   * This function gets a string from the localisation files. It uses the default language.
   * When it can't find the string in the default language it searches the string in en-en
   * @see U For more informations about U.
-  * @version Pb2.0Bfx0
-  * @since Pb2.0Bfx0
+  * @version Pb2.0Bfx0RCA
+  * @since Pb2.0Bfx0RCA
   * @param string $string The name of the string. (For example: login.name)
   * @return string The translated string
   */
diff --git a/site/includes/getProfilePicture.inc.php b/site/includes/getProfilePicture.inc.php
index 73972baae..225e1bb09 100644
--- a/site/includes/getProfilePicture.inc.php
+++ b/site/includes/getProfilePicture.inc.php
@@ -7,8 +7,8 @@
   * This is a function for the class U.
   * This function gets a value from the "settings" database.
   * @see U For more informations about U.
-  * @version Pb2.0Bfx0
-  * @since Pb2.0Bfx0
+  * @version Pb2.0Bfx0RCA
+  * @since Pb2.0Bfx0RCA
   * @param string $name The name of the setting. (For example: login.name)
   * @return mixed The value from the database.
   */
diff --git a/site/includes/getSetting.inc.php b/site/includes/getSetting.inc.php
index df9e30e12..526780ff1 100644
--- a/site/includes/getSetting.inc.php
+++ b/site/includes/getSetting.inc.php
@@ -7,8 +7,8 @@
   * This is a function for the class U.
   * This function gets a value from the "settings" database.
   * @see U For more informations about U.
-  * @version Pb2.0Bfx0
-  * @since Pb2.0Bfx0
+  * @version Pb2.0Bfx0RCA
+  * @since Pb2.0Bfx0RCA
   * @param string $name The name of the setting. (For example: login.name)
   * @return mixed The value from the database.
   */
diff --git a/site/install/index.php b/site/install/index.php
index b29b06fbf..59893ac62 100644
--- a/site/install/index.php
+++ b/site/install/index.php
@@ -6,6 +6,7 @@
   </head>
   <body>
     <h1>Install USOC</h1>
+    <h2>Experimantal feature. Sometimes doesn't work</h2>
     <ul>
       <li>Version: Pa1.8Bfx0</li>
       <li>You need PHP 7: <?php if (PHP_VERSION_ID > 69999){echo "Yes!";}else{echo "You must update!";} ?></li>
diff --git a/site/lang/en-en.json b/site/lang/en-en.json
index a3db0f296..4e0ad6074 100644
--- a/site/lang/en-en.json
+++ b/site/lang/en-en.json
@@ -20,14 +20,18 @@
     "login.login_closed": "Login closed",
     "login.succeed": "Login succeeded",
     "login.fail": "Login failed",
-    "login.not_logged_in": "Not logged in",
+    "login.not_logged_in": "Not logged in.",
+    "login.already": "Already logged in",
     "login.locked": "Your %d is permanently blocked",
     "login.account": "account",
-    "login.2fa": "2 factor authentication",
+    "login.2fa": "Two factor authentication",
+    "login.2fa.with": "Two factor authentication with %a",
     "login.2fa.false_code": "Code isn't correct",
     "login.2fa.succeed": "%a connected",
+    "login.2fa.already": "Already connected.",
     "login.2fa.google_authenticator": "Google Authenticator",
     "login.2fa.google_authenticator.code": "Code from the Google Authenticator App:",
+    "login.2fa.google_authenticator.manual": "<b>Two factor authentication with Google Authenticator</b><p>Scan following code with Google Authenticator</p><p>Attention! If you log in with your Google Account 2Fa doesn't work</p>",
     "login.changepass": "Change password",
     "login.changepass.twopassword": "Please type in two times the equal password. Or please type in a valid password.",
     "login.changepass.not_filled": "Not everything filled up or not logged in.",
@@ -40,12 +44,18 @@
     "login.oAuth.google": "Google Account",
     "login.oAuth.fail": "Already a %a connected",
     "login.oAuth.error_fail": "Error",
+    "login.oAuth.connect": "Connect %a",
     "login.invalid": "Invalid %a",
     "login.username": "username",
     "login.password": "password",
+    "login.password.repeat": "repeat password",
+    "login.username.g": "Username",
+    "login.password.g": "Password",
+    "login.password.repeat.g": "Repeat password",
     "login.mail": "mailadress",
     "login.fail_same_password": "Not the same password",
     "login.fillout": "Please fill out everything",
+    "login.logout": "You're logged out",
     "blog": "blog",
     "blog.readmore": "Read more...",
     "login.account.password_changed": "Password changed",
@@ -77,4 +87,7 @@
     "admin.send": "Send",
     "admin.back": "Back",
     "admin.welcome": "Welcome!",
+    "profile": "Profile",
+    "profile.settings": "Profile settings",
+    ""
 }
diff --git a/site/login.php b/site/login.php
index ce123ec43..c8ce2628b 100644
--- a/site/login.php
+++ b/site/login.php
@@ -1,4 +1,9 @@
-<?php session_start() ?>
+<?php
+  session_start();
+  include_once "configuration.php";
+  include_once "includes/class.inc.php";
+  newClass();
+?>
 <!DOCTYPE html>
 <html lang="<?php echo $U->getSetting("site.lang") ?>" dir="ltr">
   <head>
@@ -34,26 +39,29 @@ function onSignIn(googleUser) {
     ?>
     <article>
       <?php
-      if(isset($_GET["ERROR"])){
-        echo "<p id='error'>".getError($_GET["ERROR"],"de")."</p>";
-      }
-      if (isset($_SESSION["User_ID"])) {
-        echo "Bereits angemeldet";
-      }elseif($U->getSetting("login.login_open")==0){
-        echo "<h3>Login Geschlossen</h3>";
-      }else{
-        echo <<<HEREDOC
-        <form action="login/login.php" method="post">
-        Benutzername:
-        <input type="text" name="B" />
-        Passwort:
-        <input type="password" name="P" />
-        <input type="submit" name="button"/>
-      </form>
-      <h5>Mit Google anmelden</h5>
-      <div class="g-signin2" data-onsuccess="onSignIn"></div>
-      HEREDOC;
-    }
+        if(isset($_GET["ERROR"])){
+          echo "<p id='error'>".@getError($_GET["ERROR"],"de")."</p>";
+        }
+        if (isset($_SESSION["User_ID"])) {
+          echo $U->getLang("login.already");
+        }elseif($U->getSetting("login.login_open")==0){
+          echo "<h3>".$U->getLang("login.login_closed")."</h3>";
+        }else{
+          $HTML = <<<HEREDOC
+          <form action="login/login.php" method="post">
+          <label for="B">%a</label>
+          <input type="text" name="B" />
+          <label for="P">%b</label>
+          <input type="password" name="P" />
+          <input type="submit" name="button"/>
+          </form>
+          <h5>Mit Google anmelden</h5>
+          <div class="g-signin2" data-onsuccess="onSignIn"></div>
+          HEREDOC;
+          $HTML = str_replace("%a",$U->getLang("login.username.g"),$HTML);
+          $HTML = str_replace("%b",$U->getLang("login.password.g"),$HTML);
+          echo $HTML;
+        }
       ?>
       <form style="display:none;" action="login/googlelogintoken.php" method="post">
         <input type="text" name="token" />
diff --git a/site/logout.php b/site/logout.php
index 19a23b507..e14e3cfd0 100644
--- a/site/logout.php
+++ b/site/logout.php
@@ -1,12 +1,15 @@
 <?php
   session_start();
   session_destroy();
+  include "configuration.php";
+  include "/includes/class.inc.php";
+  newClass();
 ?>
 <!DOCTYPE html>
 <html lang="<?php echo $U->getSetting("site.lang") ?>" dir="ltr">
   <head>
-    <meta charset="utf-8">
-    <title>Case Games</title>
+    <meta charset="<?php echo $U->getLang("lang.charset"); ?>">
+    <title><?php echo getSetting("site.name") ?></title>
     <link rel="stylesheet" href="style/css.php" type="text/css" />
     <meta name="google-signin-client_id" content="*.apps.googleusercontent.com">
     <script src="https://apis.google.com/js/platform.js" async defer></script>
@@ -35,7 +38,7 @@ function onLoad() {
       include_once "siteelements/header.php"
     ?>
     <article>
-      <h1>Sie wurden ausgeloggt</h1>
+      <h1><?php echo $U->getLang("login.logout");?></h1>
     </article>
     <?php
       include_once "siteelements/footer.php"
diff --git a/site/profil.php b/site/profile.php
similarity index 80%
rename from site/profil.php
rename to site/profile.php
index f51716e86..df80e83ea 100644
--- a/site/profil.php
+++ b/site/profile.php
@@ -1,96 +1,97 @@
-<?php session_start() ?>
-<!DOCTYPE html>
-<html lang="<?php echo $U->getSetting("site.lang") ?>" dir="ltr">
-  <head>
-    <?php
-      include_once "siteelements/head.php"
-    ?>
-    <script>
-      window.onLoadCallback = function(){
-        gapi.load('auth2', function(){
-          gapi.auth2.init();
-        })
-      }
-      function onSignIn(googleUser) {
-        var id_token = googleUser.getAuthResponse().id_token;
-        var idfield=document.getElementsByName("token")[0];
-        var idsubmit = document.getElementsByName("bsubmit")[0];
-        idfield.value=id_token;
-        idsubmit.click()
-      }
-    </script>
-    <meta name="google-signin-client_id" content="756607949092-ruurljso4jm5nqlntni2llfc4g625pl5.apps.googleusercontent.com">
-    <script src="https://apis.google.com/js/platform.js" async defer></script>
-  </head>
-  <body>
-    <?php
-      include_once "siteelements/header.php"
-    ?>
-    <article>
-      <h3>Profileinstellungen</h3>
-      <?php
-        include_once "phpapi/getsettings.php";
-        include_once 'login/src/FixedBitNotation.php';
-        include_once 'login/src/GoogleAuthenticatorInterface.php';
-        include_once 'login/src/GoogleAuthenticator.php';
-
-        include_once 'login/src/GoogleQrUrl.php';
-        $g = new \Sonata\GoogleAuthenticator\GoogleAuthenticator();
-        if(isset($_SESSION["User_ID"])){
-        ?>
-        <h1><?php echo $_SESSION["User_Name"];?></h1>
-        <?php
-          echo $U->getPP();
-        ?>
-        <br><a target="_blank" href="https://de.gravatar.com"><button>Profilbild ändern auf Gravatar.com</button></a><br />
-        <?php
-        $db_link = mysqli_connect(MYSQL_HOST,MYSQL_USER,MYSQL_PASSWORD,MYSQL_DATABASE);
-        $sql = "SELECT * FROM User WHERE Username='".$_SESSION["User_Name"]."'";
-        $db_erg = mysqli_query( $db_link, $sql );
-        while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)){
-          if($zeile["google_token"] ==""){
-        ?>
-        <b>Google account verknüpfen</b>
-        <div class="g-signin2" data-onsuccess="onSignIn"></div>
-        <?php
-          }else{
-        ?>
-        <p>Google account bereits verknüpft</p>
-        <?php
-          }
-          if($zeile["google_2fa"] == ""){
-            $secret = $g->generateSecret();
-        ?>
-        <b>Zweifaktorauthentifizierung mit Google Authenticator</b>
-        <p>Folgenden Code einscannen mit Google Authenticator</p>
-        <p>Achtung! Wenn man mit Google einloggt, wird die 2fa nicht aktiv</p>
-        <img src="<?php echo \Sonata\GoogleAuthenticator\GoogleQrUrl::generate($_SESSION["User_Name"], $secret, getSetting("2fa.name"));?>">
-        <form action="login/2fa.php" method="post">
-          <input type="hidden" name="secret" value="<?php echo $secret;?>" />
-          <input name="register" type="submit" value="Den Code habe ich gescannt" />
-        </form>
-        <?php
-          }else{
-        ?>
-        <b>Zweifaktorauthentifizierung mit Google Authenticator</b>
-        <p>Bereits verknüpft</p>
-        <form action="login/2fa.php" method="post">
-          <input name="delete" type="submit" value="entknüpfen" />
-        </form>
-        <?php
-          }}}else{
-        ?>
-          <p>Du bist nicht eingeloggt.</p>
-        <?php
-          }
-        ?>
-        <?php
-          include_once "siteelements/footer.php";
-        ?>
-        <form style="display:none;" action="login/googletoken.php" method="post">
-          <input type="text" name="token" />
-          <input type="submit" name="bsubmit"/>
-        </form>
-    </article>
-  </body>
-</html>
+<?php
+  session_start();
+  include_once "configuration.php";
+  include_once "/includes/class.inc.php";
+  newClass();
+?>
+<!DOCTYPE html>
+<html lang="<?php echo $U->getSetting("site.lang") ?>" dir="ltr">
+  <head>
+    <?php
+      include_once "siteelements/head.php"
+    ?>
+    <script>
+      window.onLoadCallback = function(){
+        gapi.load('auth2', function(){
+          gapi.auth2.init();
+        })
+      }
+      function onSignIn(googleUser) {
+        var id_token = googleUser.getAuthResponse().id_token;
+        var idfield=document.getElementsByName("token")[0];
+        var idsubmit = document.getElementsByName("bsubmit")[0];
+        idfield.value=id_token;
+        idsubmit.click()
+      }
+    </script>
+    <meta name="google-signin-client_id" content="756607949092-ruurljso4jm5nqlntni2llfc4g625pl5.apps.googleusercontent.com">
+    <script src="https://apis.google.com/js/platform.js" async defer></script>
+  </head>
+  <body>
+    <?php
+      include_once "siteelements/header.php"
+    ?>
+    <article>
+      <h3><?php echo $U->getLang("Profile.settings") ?></h3>
+      <?php
+        include_once 'login/src/FixedBitNotation.php';
+        include_once 'login/src/GoogleAuthenticatorInterface.php';
+        include_once 'login/src/GoogleAuthenticator.php';
+        include_once 'login/src/GoogleQrUrl.php';
+        $g = new \Sonata\GoogleAuthenticator\GoogleAuthenticator();
+        if(isset($_SESSION["User_ID"])){
+        ?>
+        <h1><?php echo $_SESSION["User_Name"];?></h1>
+        <?php
+          echo $U->getPP();
+        ?>
+        <br><a target="_blank" href="https://de.gravatar.com"><button>Profilbild ändern auf Gravatar.com</button></a><br />
+        <?php
+        $db_link = mysqli_connect(MYSQL_HOST,MYSQL_USER,MYSQL_PASSWORD,MYSQL_DATABASE);
+        $sql = "SELECT * FROM User WHERE Username='".$_SESSION["User_Name"]."'";
+        $db_erg = mysqli_query( $db_link, $sql );
+        while ($zeile = mysqli_fetch_array( $db_erg, MYSQLI_ASSOC)){
+          if($zeile["google_token"] ==""){
+        ?>
+        <b><?php echo str_replace("%a",$U->getLang("login.oAuth.google"),$U->getLang("login.oAuth.connect")); ?></b>
+        <div class="g-signin2" data-onsuccess="onSignIn"></div>
+        <?php
+          }else{
+        ?>
+        <p><?php echo str_replace("%a",$U->getLang("login.oAuth.google"),$U->getLang("login.oAuth.fail")); ?></p>
+        <?php
+          }
+          if($zeile["google_2fa"] == ""){
+            $secret = $g->generateSecret();
+            echo $U->getLang("login.2fa.google_authenticator.manual");
+        ?>
+        <img src="<?php echo \Sonata\GoogleAuthenticator\GoogleQrUrl::generate($_SESSION["User_Name"], $secret, getSetting("2fa.name"));?>">
+        <form action="login/2fa.php" method="post">
+          <input type="hidden" name="secret" value="<?php echo $secret;?>" />
+          <input name="register" type="submit" value="Den Code habe ich gescannt" />
+        </form>
+        <?php
+          }else{
+        ?>
+        <b><?php echo str_replace("%a",$U->getLang("login.2fa.google_authenticator"),$U->getLang("login.2fa.with")); ?></b>
+        <p><?php echo $U->getLang("login.2fa.already"); ?></p>
+        <form action="login/2fa.php" method="post">
+          <input name="delete" type="submit" value="entknüpfen" />
+        </form>
+        <?php
+          }}}else{
+        ?>
+          <p><?php echo $U->getLang("login.not_logged_in"); ?></p>
+        <?php
+          }
+        ?>
+        <?php
+          include_once "siteelements/footer.php";
+        ?>
+        <form style="display:none;" action="login/googletoken.php" method="post">
+          <input type="text" name="token" />
+          <input type="submit" name="bsubmit"/>
+        </form>
+    </article>
+  </body>
+</html>
diff --git a/site/register.php b/site/register.php
index 04fbbfadc..797242e79 100644
--- a/site/register.php
+++ b/site/register.php
@@ -1,6 +1,7 @@
 <?php
   include_once "configuration.php";
   include_once "includes/class.inc.php";
+  newClass();
   function register_open(){
     if(getSetting("login.register_open")=="1"){
       return True;
@@ -31,15 +32,18 @@ function register_open(){
           $HTML += <<<HEREDOC
             </label>
             <input type="text" name="U" /><br>
-            <label for="M">Mailadresse</label>
+            <label for="M">%a</label>
             <input type="text" name="M" /><br>
-            <label for="P">Passwort</label>
+            <label for="P">%b</label>
             <input type="password" name="P" /><br>
-            <label for="PR">Passwort wiederhohlen</label>
+            <label for="PR">%c</label>
             <input type="password" name="PR" /><br>
             <input type="submit" />
           </form>
           HEREDOC;
+          $HTML = str_replace("%a",$U->getLang("login.mail.g"),$HTML);
+          $HTML = str_replace("%b",$U->getLang("login.password.g"),$HTML);
+          $HTML = str_replace("%c",$U->getLang("login.password.repeat.g"),$HTML);
           echo $HTML;
       }else{
         echo $U->getLang("register.succeed");