From 87cc55454a46cc76fbecbab6e0dfaf5cbc116f64 Mon Sep 17 00:00:00 2001
From: isaack <isaack0815@gmail.com>
Date: Sun, 3 Dec 2017 12:58:48 +0100
Subject: [PATCH] Design und kleine Bugs

Mal wieder ein paar Design anpassungen und Bugs behoben.
---
 .../content/interfacedaten/betreiber.php      |  74 ++--
 adminforce/content/interfacedaten/crons.php   |  12 +-
 .../content/interfacedaten/pageconfig.php     | 120 +++----
 .../usersystem/user_include/allgemeines.php   |  78 +++++
 .../usersystem/user_include/bet_ref.php       |  19 ++
 .../usersystem/user_include/buchungen.php     |  26 ++
 .../content/usersystem/user_include/konto.php |  25 ++
 .../usersystem/user_include/notizen.php       |  32 ++
 .../usersystem/user_include/statistik.php     |  32 ++
 .../usersystem/user_include/zugang.php        |  27 ++
 .../content/usersystem/userbearbeiten.php     | 318 ++----------------
 adminforce/index.php                          |   4 +-
 .../funktionen/setting/grundeinstellung.php   |   9 +-
 content/verdienen/forcedbanner.php            |  10 +-
 install/index.php                             |   5 +-
 lib/functions.lib.php                         |   2 +-
 lib/funktionen/chat.php                       |   6 +-
 17 files changed, 396 insertions(+), 403 deletions(-)
 create mode 100644 adminforce/content/usersystem/user_include/allgemeines.php
 create mode 100644 adminforce/content/usersystem/user_include/bet_ref.php
 create mode 100644 adminforce/content/usersystem/user_include/buchungen.php
 create mode 100644 adminforce/content/usersystem/user_include/konto.php
 create mode 100644 adminforce/content/usersystem/user_include/notizen.php
 create mode 100644 adminforce/content/usersystem/user_include/statistik.php
 create mode 100644 adminforce/content/usersystem/user_include/zugang.php

diff --git a/adminforce/content/interfacedaten/betreiber.php b/adminforce/content/interfacedaten/betreiber.php
index aa62efc..95c8a51 100644
--- a/adminforce/content/interfacedaten/betreiber.php
+++ b/adminforce/content/interfacedaten/betreiber.php
@@ -20,52 +20,52 @@ if ($_POST['updaten'] == 'Loeschen !') {
 }
 
 head("Betreiber w&auml;hlen");
-echo '<form action="" method="post"><input type="hidden" name="do" value="changeselect" /><select name="schnitstelle">';
+echo '<form action="" method="post"><input class="form-control"  type="hidden" name="do" value="changeselect" /><select name="schnitstelle">';
 $interface = db_query("SELECT schnittstelle FROM " . $db_prefix . "_schnittstelle");
 while ($interface_name = mysqli_fetch_array($interface)) {
     echo '<option value="' . $interface_name['schnittstelle'] . '">' . $interface_name['schnittstelle'] . '</option>';
 }
-echo '</select>&nbsp;<input type="submit" value="Bearbeiten" /></form><form action="" method="post"><input type="submit" value="Neu" /></form>';
+echo '</select>&nbsp;<input class="btn btn-default"  type="submit" value="Bearbeiten" /><input class="btn btn-default"  type="submit" value="Neu" /></form>';
 
 if (isset($_POST['schnitstelle'])) {
     $interface = mysqli_fetch_array(db_query('SELECT * FROM ' . $db_prefix . '_schnittstelle WHERE schnittstelle=\'' . $_POST['schnitstelle'] . '\' LIMIT 1'));
     echo '<form action="" method="post">
-    <input type="hidden" name="schnitstelle" value=' . $_POST['schnitstelle'] . '" />
-    <table width="100%" border="0" cellpadding="2" cellspacing="2">
+    <input class="form-control"  type="hidden" name="schnitstelle" value=' . $_POST['schnitstelle'] . '" />
+    <table class="table table-striped">
     <tr>
-        <td align="left" width="55%">Betreiber-ID</td><td align="left"><input type="Text" name="betreiber_id" value="' . $interface['betreiber_id'] . '" style="width:180px;"></td>
+        <td align="left" width="55%">Betreiber-ID</td><td align="left"><input class="form-control"  type="Text" name="betreiber_id" value="' . $interface['betreiber_id'] . '" style="width:180px;"></td>
     </tr>
     <tr>
-        <td align="left">Betreiberpasswort</td><td align="left"><input type="Text" name="betreiber_passwort" value="' . $interface['betreiber_passwort'] . '" style="width:180px;"></td>
+        <td align="left">Betreiberpasswort</td><td align="left"><input class="form-control"  type="Text" name="betreiber_passwort" value="' . $interface['betreiber_passwort'] . '" style="width:180px;"></td>
     </tr>
     <tr>
-        <td align="left">Betreiberkennung<br><i>Sofern notwendig</i></td><td align="left"><input type="Text" name="betreiber_kennung" value="' . $interface['betreiber_kennung'] . '" style="width:180px;"></td>
+        <td align="left">Betreiberkennung<br><i>Sofern notwendig</i></td><td align="left"><input class="form-control"  type="Text" name="betreiber_kennung" value="' . $interface['betreiber_kennung'] . '" style="width:180px;"></td>
     </tr>
     <tr>
-        <td align="left">Schnittstelle<br><i>Dateiname der Schnittstelle</i></td><td align="left"><input type="Text" name="schnittstelle" value="' . $interface['schnittstelle'] . '" style="width:180px;">.php
+        <td align="left">Schnittstelle<br><i>Dateiname der Schnittstelle</i></td><td align="left"><input class="form-control"  type="Text" name="schnittstelle" value="' . $interface['schnittstelle'] . '" style="width:180px;">.php
     </td>
     </tr>
     <tr>
-        <td align="left">Einzahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input type="Text" name="einzahltext" value="' . $interface['einzahltext'] . '"  style="width:180px;" maxlength="40"></td>
+        <td align="left">Einzahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input class="form-control"  type="Text" name="einzahltext" value="' . $interface['einzahltext'] . '"  style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Auszahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input type="Text" name="auszahltext" value="' . $interface['auszahltext'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">Auszahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input class="form-control"  type="Text" name="auszahltext" value="' . $interface['auszahltext'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Minimum Einzahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input type="Text" name="einzahlsumme" value="' . $interface['einzahlsumme'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">Minimum Einzahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input class="form-control"  type="Text" name="einzahlsumme" value="' . $interface['einzahlsumme'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Minimum Auszahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input type="Text" name="auszahlsumme" value="' . $interface['auszahlsumme'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">Minimum Auszahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input class="form-control"  type="Text" name="auszahlsumme" value="' . $interface['auszahlsumme'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Max. Schnittstellenanfragen (Tag)<br><i>0 = Ohne Einschränkung<br>Nur für Anmeldungen</i></td><td align="left"><input type="Text" name="anfragen_tag" value="' . $interface['anfragen_tag'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">Max. Schnittstellenanfragen (Tag)<br><i>0 = Ohne Einschränkung<br>Nur für Anmeldungen</i></td><td align="left"><input class="form-control"  type="Text" name="anfragen_tag" value="' . $interface['anfragen_tag'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Max. Schnittstellenanfragen (User)<br><i>0 = Ohne Einschränkung<br>Nur Ein./Auszahlungen</i></td><td align="left"><input type="Text" name="anfragen_user" value="' . $interface['anfragen_user'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">Max. Schnittstellenanfragen (User)<br><i>0 = Ohne Einschränkung<br>Nur Ein./Auszahlungen</i></td><td align="left"><input class="form-control"  type="Text" name="anfragen_user" value="' . $interface['anfragen_user'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
         <td align="left">Status</td><td align="left">
-        <select name="aktiv">';
+        <select class="form-control" name="aktiv">';
     ?>
     	<option value="0" <?php if ($interface['aktiv'] == 0) echo 'selected'; ?>>Nicht&nbsp;verf&uuml;gbar</option>
     	<option value="1" <?php if ($interface['aktiv'] == 1) echo 'selected'; ?>>Einzahlungen</option>
@@ -76,18 +76,18 @@ if (isset($_POST['schnitstelle'])) {
     </td>
     </tr>
     <tr>
-        <td align="left">W&auml;hrungsname</td><td align="left"><input type="Text" name="waehrung_name" value="' . $interface['waehrung_name'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">W&auml;hrungsname</td><td align="left"><input class="form-control"  type="Text" name="waehrung_name" value="' . $interface['waehrung_name'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">XX&nbsp;Punkt&nbsp;* XX =&nbsp;XX Externen&nbsp;Waehrung</td><td align="left"><input type="Text" name="punktewert" value="' . $interface['punktewert'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">XX&nbsp;Punkt&nbsp;* XX =&nbsp;XX Externen&nbsp;Waehrung</td><td align="left"><input class="form-control"  type="Text" name="punktewert" value="' . $interface['punktewert'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">XX Externe&nbsp;Waehrung&nbsp;/ XX=&nbsp;= XX&nbsp;Punkt</td><td align="left"><input type="Text" name="wertepunkt" value="' . $interface['wertepunkt'] . '" style="width:180px;" maxlength="40"></td>
+        <td align="left">XX Externe&nbsp;Waehrung&nbsp;/ XX=&nbsp;= XX&nbsp;Punkt</td><td align="left"><input class="form-control"  type="Text" name="wertepunkt" value="' . $interface['wertepunkt'] . '" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td ><input type="Submit" name="updaten" value="Updaten !"></td>
-        <td ><input type="Submit" name="updaten" value="Hinzufuegen !"></td>
-        <td ><input type="Submit" name="updaten" value="Loeschen !"></td>
+        <td ><input class="btn btn-default btn-block" type="Submit" name="updaten" value="Updaten !"></td>
+        <td ><input class="btn btn-default btn-block" type="Submit" name="updaten" value="Hinzufuegen !"></td>
+        <td ><input class="btn btn-default btn-block" type="Submit" name="updaten" value="Loeschen !"></td>
     </tr>
 
     </table>
@@ -95,42 +95,42 @@ if (isset($_POST['schnitstelle'])) {
 } else {
     echo '
     <form action="" method="post">
-    <table width="100%" border="0" cellpadding="2" cellspacing="2">
+    <table class="table table-striped">
     <tr>
-        <td align="left" width="55%">Betreiber-ID</td><td align="left"><input type="Text" name="betreiber_id" style="width:180px;"></td>
+        <td align="left" width="55%">Betreiber-ID</td><td align="left"><input class="form-control"  type="Text" name="betreiber_id" style="width:180px;"></td>
     </tr>
     <tr>
-        <td align="left">Betreiberpasswort</td><td align="left"><input type="Text" name="betreiber_passwort"  style="width:180px;"></td>
+        <td align="left">Betreiberpasswort</td><td align="left"><input class="form-control"  type="Text" name="betreiber_passwort"  style="width:180px;"></td>
     </tr>
     <tr>
-        <td align="left">Betreiberkennung<br><i>Sofern notwendig</i></td><td align="left"><input type="Text" name="betreiber_kennung"  style="width:180px;"></td>
+        <td align="left">Betreiberkennung<br><i>Sofern notwendig</i></td><td align="left"><input class="form-control"  type="Text" name="betreiber_kennung"  style="width:180px;"></td>
     </tr>
     <tr>
-        <td align="left">Schnittstelle<br><i>Dateiname der Schnittstelle</i></td><td align="left"><input type="Text" name="schnittstelle"  style="width:180px;">.php
+        <td align="left">Schnittstelle<br><i>Dateiname der Schnittstelle</i></td><td align="left"><input class="form-control"  type="Text" name="schnittstelle"  style="width:180px;">.php
     </td>
     </tr>
     <tr>
-        <td align="left">Einzahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input type="Text" name="einzahltext"   style="width:180px;" maxlength="40"></td>
+        <td align="left">Einzahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input class="form-control"  type="Text" name="einzahltext"   style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Auszahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input type="Text" name="auszahltext"  maxlength="40"></td>
+        <td align="left">Auszahltext<br><i>Max. 40 Zeichen</i></td><td align="left"><input class="form-control"  type="Text" name="auszahltext"  maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Minimum Einzahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input type="Text" name="einzahlsumme"  style="width:180px;" maxlength="40"></td>
+        <td align="left">Minimum Einzahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input class="form-control"  type="Text" name="einzahlsumme"  style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Minimum Auszahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input type="Text" name="auszahlsumme"  style="width:180px;" maxlength="40"></td>
+        <td align="left">Minimum Auszahlsumme<br><i>0 = Ohne Einschränkung</i></td><td align="left"><input class="form-control"  type="Text" name="auszahlsumme"  style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Max. Schnittstellenanfragen (Tag)<br><i>0 = Ohne Einschränkung<br>Nur für Anmeldungen</i></td><td align="left"><input type="Text" name="anfragen_tag" style="width:180px;" maxlength="40"></td>
+        <td align="left">Max. Schnittstellenanfragen (Tag)<br><i>0 = Ohne Einschränkung<br>Nur für Anmeldungen</i></td><td align="left"><input class="form-control"  type="Text" name="anfragen_tag" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">Max. Schnittstellenanfragen (User)<br><i>0 = Ohne Einschränkung<br>Nur Ein./Auszahlungen</i></td><td align="left"><input type="Text" name="anfragen_user" style="width:180px;" maxlength="40"></td>
+        <td align="left">Max. Schnittstellenanfragen (User)<br><i>0 = Ohne Einschränkung<br>Nur Ein./Auszahlungen</i></td><td align="left"><input class="form-control"  type="Text" name="anfragen_user" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
         <td align="left">Status</td>
 		<td align="left">
-			<select name="aktiv">
+			<select class="form-control" name="aktiv">
 				<option value="0" >Nicht&nbsp;verf&uuml;gbar</option>
 				<option value="1" >Einzahlungen</option>
 				<option value="2" >Auszahlungen</option>
@@ -139,16 +139,16 @@ if (isset($_POST['schnitstelle'])) {
 		</td>
     </tr>
     <tr>
-        <td align="left">W&auml;hrungsname</td><td align="left"><input type="Text" name="waehrung_name"  style="width:180px;" maxlength="40"></td>
+        <td align="left">W&auml;hrungsname</td><td align="left"><input class="form-control"  type="Text" name="waehrung_name"  style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">XX&nbsp;Punkt&nbsp;* XX =&nbsp;XX Externen&nbsp;Waehrung</td><td align="left"><input type="Text" name="punktewert" style="width:180px;" maxlength="40"></td>
+        <td align="left">XX&nbsp;Punkt&nbsp;* XX =&nbsp;XX Externen&nbsp;Waehrung</td><td align="left"><input class="form-control"  type="Text" name="punktewert" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="left">XX Externe&nbsp;Waehrung&nbsp;/ XX=&nbsp;= XX&nbsp;Punkt</td><td align="left"><input type="Text" name="wertepunkt" style="width:180px;" maxlength="40"></td>
+        <td align="left">XX Externe&nbsp;Waehrung&nbsp;/ XX=&nbsp;= XX&nbsp;Punkt</td><td align="left"><input class="form-control"  type="Text" name="wertepunkt" style="width:180px;" maxlength="40"></td>
     </tr>
     <tr>
-        <td align="center" colspan="2"><input type="Submit" name="updaten" value="Hinzufuegen !"></td>
+        <td align="center" colspan="2"><input class="btn btn-default btn-block"  type="Submit" name="updaten" value="Hinzufuegen !"></td>
     </tr>
     </table>
     </form>
diff --git a/adminforce/content/interfacedaten/crons.php b/adminforce/content/interfacedaten/crons.php
index 35ca2f2..427fdc8 100644
--- a/adminforce/content/interfacedaten/crons.php
+++ b/adminforce/content/interfacedaten/crons.php
@@ -1,9 +1,9 @@
 <?php head("Crons (Übersicht und manuell Start)");?>
-<table class="tabellen">
-<tr class="tabellenhead">
-    <td align="center"><b>Cron</b></td>
-    <td align="center"><b>Laufzeit</b></td>
-    <td align="center">URL</td>
+<table class="table table-striped">
+<tr>
+    <th align="center">Cron</th>
+    <th align="center">Laufzeit</th>
+    <th align="center">URL</th>
 </tr>
 <?php
 $crons = db_query("SELECT * FROM " . $db_prefix . "_crons");
@@ -12,7 +12,7 @@ while ($crontabelle = mysqli_fetch_array($crons)) {
     $row = ($i % 2 == 0) ? 0 : 1;
 
     echo '
-<tr class="tabellenbody_' . $row . '">
+<tr>
     <td valign="middle"><b>' . $crontabelle['bezeichnung'] . '</b><br>
         <i>ID: ' . $crontabelle['id'] . '</i>
     </td>
diff --git a/adminforce/content/interfacedaten/pageconfig.php b/adminforce/content/interfacedaten/pageconfig.php
index 96773d3..ecffc55 100644
--- a/adminforce/content/interfacedaten/pageconfig.php
+++ b/adminforce/content/interfacedaten/pageconfig.php
@@ -5,98 +5,98 @@ $interface = mysqli_fetch_array(db_query("SELECT * FROM ".$db_prefix."_seitenkon
 
 head("Webseiteneinstellungen"); ?>
 <form action="" method="post">
-<table width="100%" align="center" border="0" cellpadding="1" cellspacing="1" bgcolor="#c0c0c0">
-	<tr bgcolor="#f5f5f5">
+<table class="table table-striped">
+	<tr>
 		<td align="left"><b>Wartungsmodus</b><br><i>Wartungstext muss bearbeitet werden!</i></td>
-		<td align="left"><input type="checkbox" name="wartung" <?php if ($interface['wartung'] == 1) echo 'checked';?>></td>
+		<td align="left"><inputclass="form-control" type="checkbox" name="wartung" <?php if ($interface['wartung'] == 1) echo 'checked';?>></td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Domain</b><br><i>URL deiner Seite</i></td>
-		<td align="left">&nbsp;<input type="Text" name="domain" value="<?php echo $interface['domain'];?>"></td>
+		<td align="left"><input class="form-control" type="Text" name="domain" value="<?php echo $interface['domain'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>Seitenname</b><br><i>Name wie deine Seite hei&szlig;t</i></td>
-		<td align="left">&nbsp;<input type="Text" name="seitenname" value="<?php echo $interface['seitenname'];?>"></td>
+		<td align="left"><input class="form-control" type="Text" name="seitenname" value="<?php echo $interface['seitenname'];?>"></td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Name der W&auml;hrung</b><br><i>Name deiner W&auml;hrung</i></td>
-		<td align="left">&nbsp;<input type="Text" name="waehrung" value="<?php echo $interface['waehrung'];?>"></td>
+		<td align="left"><input class="form-control" type="Text" name="waehrung" value="<?php echo $interface['waehrung'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>Betreiber E-Mail Adresse</b><br><i>Deine E-Mail Adresse von der alle Mails kommen sollen.</i></td>
-		<td align="left">&nbsp;<input type="Text" name="betreibermail" value="<?php echo $interface['betreibermail'];?>"></td>
+		<td align="left"><input class="form-control" type="Text" name="betreibermail" value="<?php echo $interface['betreibermail'];?>"></td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Cron-PW</b><br><i>Passwort f&uuml;r die Crons</i></td>
-		<td align="left">&nbsp;<input type="Text" name="cron_pw" value="<?php echo $interface['cron_pw'];?>"></td>
+		<td align="left"><input class="form-control" type="Text" name="cron_pw" value="<?php echo $interface['cron_pw'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
-		<td align="left"><b>Einzahlgrenze</b><br><i>Max. Guthaben pro User!</i></td>
-		<td align="left">&nbsp;<input type="Text" name="einzahlgrenze" value="<?php echo $interface['einzahlgrenze'];?>"> Nur Ganzzahlen</td>
+	<tr>
+		<td align="left"><b>Einzahlgrenze</b><br><i>Max. Guthaben pro User! (Ganzzahl)</i></td>
+		<td align="left"><input class="form-control" type="Text" name="einzahlgrenze" value="<?php echo $interface['einzahlgrenze'];?>"></td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Refebene 1</b><br><i>Angaben in Prozent!</i></td>
-		<td align="left">&nbsp;<input type="Text" name="re1" value="<?php echo $interface['re1'];?>"> Punkt statt Komma</td>
+		<td align="left"><input class="form-control" type="Text" name="re1" value="<?php echo $interface['re1'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>Refebene 2</b><br><i>Angaben in Prozent!</i></td>
-		<td align="left">&nbsp;<input type="Text" name="re2" value="<?php echo $interface['re2'];?>"> Punkt statt Komma</td>
+		<td align="left"><input class="form-control" type="Text" name="re2" value="<?php echo $interface['re2'];?>"></td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Refebene 3</b><br><i>Angaben in Prozent!</i></td>
-		<td align="left">&nbsp;<input type="Text" name="re3" value="<?php echo $interface['re3'];?>"> Punkt statt Komma</td>
+		<td align="left"><input class="form-control" type="Text" name="re3" value="<?php echo $interface['re3'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>min. Verdienst (Bettelaufruf)</b></td>
-		<td align="left">&nbsp;<input type="Text" name="min_betteln" value="<?php echo $interface['min_betteln'];?>"> Punkt statt Komma</td>
+		<td align="left"><input class="form-control" type="Text" name="min_betteln" value="<?php echo $interface['min_betteln'];?>"></td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>max. Verdienst (Bettelaufruf)</b></td>
-		<td align="left">&nbsp;<input type="Text" name="max_betteln" value="<?php echo $interface['max_betteln'];?>"> Punkt statt Komma</td>
+		<td align="left"><input class="form-control" type="Text" name="max_betteln" value="<?php echo $interface['max_betteln'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>Reloadzeit (Bettelaufruf)</b><br><i>Angaben in Sekunden (3600 = 1 Stunde) (0 = Bettellink deaktiviert)</i></td>
-		<td align="left">&nbsp;<input type="Text" name="reload_betteln" value="<?php echo $interface['reload_betteln'];?>"> Nur Ganzzahlen</td>
+		<td align="left"><input class="form-control" type="Text" name="reload_betteln" value="<?php echo $interface['reload_betteln'];?>"></td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Nicht erlaubte eMail-Domains</b><br><i>(Durch ; getrennt)</i></td>
-		<td align="left">&nbsp;<input type="Text" name="denied_domains" value="<?php echo $interface['denied_domains'];?>"></td>
+		<td align="left"><input class="form-control" type="Text" name="denied_domains" value="<?php echo $interface['denied_domains'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>Startseite Userbereich</b><br><i>Ausw&auml;hlen was angezeigt werden soll auf der Startseite</i></td>
 		<td align="left">
 			<table width="50%">
 				<tr>
 					<td>Chat</td>
-					<td align="center"><input type="checkbox" name="anzeige_chat" <?php if($interface['anzeige_chat'] == 1){ echo 'CHECKED';} ?>></td>
+					<td align="center"><input class="form-control" type="checkbox" name="anzeige_chat" <?php if($interface['anzeige_chat'] == 1){ echo 'CHECKED';} ?>></td>
 				</tr>
 				<tr>
 					<td>Startseitentext</td>
-					<td align="center"><input type="checkbox" name="anzeige_text"  <?php if($interface['anzeige_text'] == 1){ echo 'CHECKED';} ?>></td>
+					<td align="center"><input class="form-control" type="checkbox" name="anzeige_text"  <?php if($interface['anzeige_text'] == 1){ echo 'CHECKED';} ?>></td>
 				</tr>
 			</table>
 		</td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Verdienst (Startseitenaufruf)</b></td>
-		<td align="left">&nbsp;<input type="Text" name="verdienst_start" value="<?php echo $interface['verdienst_start'];?>"> Punkt statt Komma</td>
+		<td align="left"><input class="form-control" type="Text" name="verdienst_start" value="<?php echo $interface['verdienst_start'];?>"></td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>Reloadzeit (Startseitenaufruf)</b></td>
-		<td align="left">&nbsp;<input type="Text" name="reload_start" value="<?php echo $interface['reload_start'];?>"> In Sekunden</td>
+		<td align="left"><input class="form-control" type="Text" name="reload_start" value="<?php echo $interface['reload_start'];?>"> In Sekunden</td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Vergütung als Popup</b><br><i>Startseitenvergütung!</i></td>
-		<td align="left">&nbsp;
+		<td align="left">
 			<select name="popup_start">
 				<option value="0" <?php if ($interface['popup_start'] == 0) echo 'SELECTED';?>>Deaktiviert</option>
 				<option value="1" <?php if ($interface['popup_start'] == 1) echo 'SELECTED';?>>Aktiviert</option>
 			</select>
 		</td>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td align="left"><b>Geburtstagsaddon aktivieren</b></td>
-		<td align="left">&nbsp;<select name="geb_addon">
+		<td align="left"><select name="geb_addon">
 			<option value="0" <?php if ($interface['geb_addon'] == 0) echo 'SELECTED';?>>Deaktiviert</option>
 			<option value="1" <?php if ($interface['geb_addon'] == 1) echo 'SELECTED';?>>Aktiviert</option>
 		</select>
@@ -106,51 +106,51 @@ head("Webseiteneinstellungen"); ?>
 		
 		</td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>News Kommentar</b><br><i>Damit k&ouml;nnen die User die News kommentieren</a></td>
-		<td align="left">&nbsp;<select name="news_komment">
-			<option value="0" <?php if ($interface['news_komment'] == 0) echo 'SELECTED';?>>Deaktiviert&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>
+		<td align="left"><select name="news_komment">
+			<option value="0" <?php if ($interface['news_komment'] == 0) echo 'SELECTED';?>>Deaktiviert</option>
 			<option value="1" <?php if ($interface['news_komment'] == 1) echo 'SELECTED';?>>Aktiviert</option>
 		</select>	
 		</td>
 	</tr>
-	<tr bgcolor="#f0f0f0">
+	<tr>
 		<td align="left"><b>Buchungen l&ouml;schen</b><br><i>Buchungen die &auml;lter als wieviel Tage sind sollen gel&ouml;sch werden?</td>
-		<td align="left">&nbsp;<select name="buchungen_loeschen">
-			<option value="0" <?php if ($interface['buchungen_loeschen'] == 0) echo 'SELECTED';?>>Deaktiviert&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>
+		<td align="left"><select name="buchungen_loeschen">
+			<option value="0" <?php if ($interface['buchungen_loeschen'] == 0) echo 'SELECTED';?>>Deaktiviert</option>
 			<option value="1" <?php if ($interface['buchungen_loeschen'] == 1) echo 'SELECTED';?>>Aktiviert</option>
 		</select>
 		<?php
-		if ($interface['buchungen_loeschen'] == 1){ echo '<input style="width:100px;" type="text" name="buchungen_loeschen_tage" value="'.$interface['buchungen_loeschen_tage'].'"> Tage';}
+		if ($interface['buchungen_loeschen'] == 1){ echo '<input class="form-control" style="width:100px;" type="text" name="buchungen_loeschen_tage" value="'.$interface['buchungen_loeschen_tage'].'"> Tage';}
 		?>
 	</tr>
-	<tr bgcolor="#f5f5f5">
+	<tr>
 		<td><b>Auszahlungssperre bei Neuanmeldung</b><br>
 							<i>Jede Neuanmeldung muss erst manuell freigeschaltet werden</i></td>
-		<td>&nbsp;
+		<td>
 			<select name="auszahlung_sperre">
-				<option value="0" <?php if ($interface['auszahlung_sperre'] == 1) echo 'SELECTED';?>>Deaktiviert&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>
+				<option value="0" <?php if ($interface['auszahlung_sperre'] == 1) echo 'SELECTED';?>>Deaktiviert</option>
 				<option value="1" <?php if ($interface['auszahlung_sperre'] == 0) echo 'SELECTED';?>>Aktiviert</option>
 		</td>
 	</tr>
 	<tr>
-		<td align="center" colspan="2"><input type="Submit" name="updaten" value="Updaten !"></td>
+		<td align="center" colspan="2"><input class="btn btn-default" type="Submit" name="updaten" value="Updaten !"></td>
 	</tr>
 </table>
 </form>
 
 <form method="post" action="">
-	<table>
-		<tr bgcolor="#f0f0f0">
-			<td align="left"><b>Loginname (Adminforce)</b></td>
-			<td align="left">&nbsp;<input type="Text" name="admin_name" value="<?php echo base64_decode($interface['admin_name']);?>"></td>
+	<table class="table">
+		<tr>
+			<th align="left"><b>Loginname (Adminforce)</b></th>
+			<td align="left"><input class="form-control" type="Text" name="admin_name" value="<?php echo base64_decode($interface['admin_name']);?>"></td>
 		</tr>
-		<tr bgcolor="#f5f5f5">
-			<td align="left"><b>Passwort (Adminforce)</b></td>
-			<td align="left">&nbsp;<input type="Text" name="admin_pass"></td>
+		<tr>
+			<th align="left"><b>Passwort (Adminforce)</b></th>
+			<td align="left"><input class="form-control" type="Text" name="admin_pass"></td>
 		</tr>
 		<tr>
-			<td align="center" colspan="2"><input type="Submit" name="admin" value="Zugangsdaten &Auml;ndern"></td>
+			<td align="center" colspan="2"><input class="btn btn-default" type="Submit" name="admin" value="Zugangsdaten &Auml;ndern"></td>
 		</tr>
 	</table>
 </form>
diff --git a/adminforce/content/usersystem/user_include/allgemeines.php b/adminforce/content/usersystem/user_include/allgemeines.php
new file mode 100644
index 0000000..44cf642
--- /dev/null
+++ b/adminforce/content/usersystem/user_include/allgemeines.php
@@ -0,0 +1,78 @@
+<form action="" method="POST">
+<input type="hidden" name="uid" value="<?php echo $alledaten['uid'];?>">
+<input type="hidden" name="alt_werber" value="<?php echo $alledaten['werber'];?>">
+<table class="table table-striped">
+	<tr bgcolor="#fafafa">
+		<td align="right"><b>User-ID</b>:&nbsp;</td>
+		<td align="left">&nbsp;<?php echo $alledaten['uid'];?></td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td align="right"><b>Nickname</b>:&nbsp;</td>
+		<td align="left">&nbsp;<input type="text" name="nickname" value="<?php echo $alledaten['nickname'];?>"></td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td align="right"><b>Werber-ID</b>:&nbsp;</td>
+		<td align="left">&nbsp;<input type="text" name="werber" value="<?php echo $alledaten['werber'];?>"></td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td align="right"><b>Vorname</b>:&nbsp;</td>
+		<td align="left">&nbsp;<input type="text" name="vorname" value="<?php echo $alledaten['vorname'];?>"></td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td align="right"><b>Nachname</b>:&nbsp;</td>
+		<td align="left">&nbsp;<input type="text" name="nachname" value="<?php echo $alledaten['nachname'];?>"></td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td align="right"><b>eMailadresse</b>:&nbsp;</td>
+		<td align="left">&nbsp;<input type="text" name="emailadresse" value="<?php echo $alledaten['emailadresse'];?>"></td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td align="right"><b>eMail-Empfang</b>:&nbsp;</td>
+		<td align="left">&nbsp;<select name="freigabe_fuer" size="1">
+		<option value="0" <?php if ($alledaten['freigabe_fuer'] == 0) echo'SELECTED';?>>Kein Empfang</option>
+		<option value="1" <?php if ($alledaten['freigabe_fuer'] == 1) echo'SELECTED';?>>Nur Newsletter</option>
+		<option value="2" <?php if ($alledaten['freigabe_fuer'] == 2) echo'SELECTED';?>>Nur Paidmails</option>
+		<option value="3" <?php if ($alledaten['freigabe_fuer'] == 3) echo'SELECTED';?>>Newsletter / Paidmails</option>
+		</select></td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td align="right">&nbsp;<b>Bettelsperre</b>:</td>
+		<td align="left">&nbsp;
+			<select name="bettel_sperre" size="1">
+				<option value="0" <?php if ($alledaten['bettel_sperre'] == 0) echo'SELECTED';?>>deaktiviert</option>
+				<option value="1" <?php if ($alledaten['bettel_sperre'] == 1) echo'SELECTED';?>>aktiviert</option>
+			</select>
+		</td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td align="right">&nbsp;<b>Banner Sperre</b>:</td>
+		<td align="left">&nbsp;
+			<select name="forced_sperre" size="1">
+				<option value="0" <?php if ($alledaten['forced_sperre'] == 0) echo'SELECTED';?>>deaktiviert</option>
+				<option value="1" <?php if ($alledaten['forced_sperre'] == 1) echo'SELECTED';?>>aktiviert</option>
+			</select>
+		</td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td align="right">&nbsp;<b>Chat Sperre</b>:</td>
+		<td align="left">&nbsp;
+			<select name="chat_sperre" size="1">
+				<option value="0" <?php if ($alledaten['chat_sperre'] == 0) echo'SELECTED';?>>deaktiviert</option>
+				<option value="1" <?php if ($alledaten['chat_sperre'] == 1) echo'SELECTED';?>>aktiviert</option>
+			</select>
+		</td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td><b>Auszahlungssperre</b></td>
+		<td>
+			<select name="auszahlung_sperre">
+				<option value="0" <?php if ($alledaten['auszahlung_sperre'] == 1) echo'SELECTED';?>>Gesperrt</option>
+				<option value="1" <?php if ($alledaten['auszahlung_sperre'] == 0) echo'SELECTED';?>>Freigeschaltet</option>
+			</select>
+		</td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td align="center" colspan="2"><br /><input type="submit" name="profile" value="&raquo; Updaten"><br />&nbsp;</td>
+	</tr>
+</table>
+</form>
\ No newline at end of file
diff --git a/adminforce/content/usersystem/user_include/bet_ref.php b/adminforce/content/usersystem/user_include/bet_ref.php
new file mode 100644
index 0000000..ef3087c
--- /dev/null
+++ b/adminforce/content/usersystem/user_include/bet_ref.php
@@ -0,0 +1,19 @@
+<table class="table table-striped">
+		<tr class="tabellenhead">
+			<td>Zeit</td>
+			<td>Verg&uuml;tung</td>
+			<td>Refferer</td>
+		</tr>
+<?php
+		$ref = db_query("SELECT zeit,betrag,refferer FROM ".$db_prefix."_bettel_buchung WHERE uid = '".$alledaten['uid']."' ");
+		while($refferer = mysqli_fetch_array($ref)){
+			echo '
+			<tr>
+				<td>'.date("d.m.Y - H:i", $refferer['zeit']).'</td>
+				<td>'.number_format($refferer['betrag'],2,",",".").'</td>
+				<td><a href="'.$refferer['refferer'].'" target="_new">'.$refferer['refferer'].'</a></td>
+			</tr>
+			';
+		}
+?>
+	</table>
\ No newline at end of file
diff --git a/adminforce/content/usersystem/user_include/buchungen.php b/adminforce/content/usersystem/user_include/buchungen.php
new file mode 100644
index 0000000..601e94c
--- /dev/null
+++ b/adminforce/content/usersystem/user_include/buchungen.php
@@ -0,0 +1,26 @@
+<table class="table table-striped table-hover">
+<tr class="tabellenhead">
+<td align="center"><b>Buchungs Id</b></td>
+<td align="center"><b>Datum</b></td>
+<td align="center"><b>Zeit</b></td>
+<td align="center"><b><?php echo $waehrung;?></b></td>
+<td align="center"><b>Verwendungszweck</b></td>
+</tr>
+<?php
+$buchungen_lesen = db_query('SELECT * FROM '.$db_prefix.'_buchungen WHERE uid = '.$alledaten['uid'].' ORDER BY buchungszeit DESC LIMIT 250');
+while ($buchung_schreiben = mysqli_fetch_array($buchungen_lesen)) {
+$i++;
+	$buchcolor = ($buchung_schreiben['buchungsmenge'] > 0) ? '#000000' : '#cc0000';
+	$linecolor = ($i %2 == 0) ? 1 : 0;
+?>
+<tr class="tabellenbody_<?php echo $linecolor;?>">
+<td align="left">&nbsp;<?php echo $buchung_schreiben['buchungs_id'];?></td>
+<td align="center">&nbsp;<?php echo date("d.m.Y",$buchung_schreiben['buchungszeit']);?>&nbsp;</td>
+<td align="center">&nbsp;<?php echo date("H:i",$buchung_schreiben['buchungszeit']);?>&nbsp;</td>
+<td align="right">&nbsp;<font color="<?php echo $buchcolor;?>"><?php echo number_format($buchung_schreiben['buchungsmenge'],2,",",".");?></font>&nbsp;</td>
+<td align="left">&nbsp;<?php echo $buchung_schreiben['verwendungszweck'];?></td>
+</tr>
+<?php
+}
+?>
+</table>
\ No newline at end of file
diff --git a/adminforce/content/usersystem/user_include/konto.php b/adminforce/content/usersystem/user_include/konto.php
new file mode 100644
index 0000000..f76cb88
--- /dev/null
+++ b/adminforce/content/usersystem/user_include/konto.php
@@ -0,0 +1,25 @@
+<form action="" method="POST">
+<input type="hidden" name="uid" value="<?php echo $alledaten['uid'];?>">
+<input type="hidden" name="email" value="<?php echo $alledaten['emailadresse'];?>">
+<table class="table table-striped">
+	<tr>
+		<td><b>Kontostand</b>:</td>
+		<td><?php echo number_format($alledaten['kontostand'],2,",",".").' '.$waehrung;?></td>
+	</tr>
+	<tr>
+		<td><br /><b>Summe</b>:</td>
+		<td><select style="width: 40px" name="buchungsart" size="1"><option value="+" SELECTED>+</option><option value="-">-</option></select><input style="width: 100px;" type="Text" name="buchungssumme" value=""></td>
+	</tr>
+	<tr>
+		<td><br /><b>Grund</b> (max. 30 Zeichen):</td>
+		<td><input style="width: 140px" type="text" name="buchungstext" value="" maxlength="30"></td>
+	</tr>
+	<tr>
+		<td><br /><b>Mail an User</b>:</td>
+		<td><input type="radio" name="send_mail" value="ja" /> Ja &nbsp; <input checked="checked" type="radio" name="send_mail" value="nein" /> Nein</td>
+	</tr>
+</table>
+<div class="text-center">
+	<input type="submit" name="finanze" class="btn btn-default" value="&raquo; Buchen" />
+</div>
+</form>
\ No newline at end of file
diff --git a/adminforce/content/usersystem/user_include/notizen.php b/adminforce/content/usersystem/user_include/notizen.php
new file mode 100644
index 0000000..6870d05
--- /dev/null
+++ b/adminforce/content/usersystem/user_include/notizen.php
@@ -0,0 +1,32 @@
+<center>
+	<form action="" method="POST">
+		<table align="center" border="0" cellpadding="0" cellspacing="2">
+			   <tr>
+				<td><b>Notizen</b>:<br />
+				<textarea name="text" cols="50" rows="20"></textarea></td>
+			</tr>
+			<tr>
+				<td align="center"><br /><input type="submit" name="notice" value="&raquo; Speichern" /></td>
+			</tr>
+		</table>
+	</form>
+</center>
+<hr>
+<br>
+<table class="table">
+	<tr>
+		<td></td>
+		<td>Notiz</td>
+	</tr>
+<?php
+	$da = db_query("SELECT * FROM ".$db_prefix."_user_notizen WHERE uid = '". mysqli_real_escape_string($sql_open,$_GET['uid']) ."' ");
+	while($daten = mysqli_fetch_array($da)){
+		echo '
+			<tr>
+				<td>'. date("d.m.Y", $daten['datum']) .'<br>Admin-ID: '.$daten['admin_id'] .'</td>
+				<td>'. nl2br($daten['text']) .'</td>
+			</tr>
+		';
+	}
+?>
+</table>
\ No newline at end of file
diff --git a/adminforce/content/usersystem/user_include/statistik.php b/adminforce/content/usersystem/user_include/statistik.php
new file mode 100644
index 0000000..b1eca2b
--- /dev/null
+++ b/adminforce/content/usersystem/user_include/statistik.php
@@ -0,0 +1,32 @@
+<table class="table table-striped">
+	<tr bgcolor="#fafafa">
+		<td>&nbsp;<b>Refback</b>:</td>
+		<td colspan="2" align="right"><?php echo $alledaten['refback'];?> %&nbsp;</td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td>&nbsp;<b>Angemeldet</b>:</td>
+		<td colspan="2" align="right"><?php echo date('d.m.Y H:i', $alledaten['angemeldet_seit']);?>&nbsp;</td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td>&nbsp;<b>Letzter Login</b>:</td>
+		<td colspan="2" align="right"><?php echo date('d.m.Y H:i', $alledaten['loginzeit']);?>&nbsp;</td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td>&nbsp;<b>Letzte Aktivit&auml;t</b>:</td>
+		<td colspan="2" align="right"><?php echo date('d.m.Y H:i', $alledaten['last_active']);?>&nbsp;</td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td>&nbsp;<b>Letzte IP</b>:</td>
+		<td colspan="2" align="right"><?php echo $alledaten['login_ip'];?>&nbsp;</td>
+	</tr>
+	<tr bgcolor="#ededed">
+		<td>&nbsp;<b>ForcedKlicks</b>:</td>
+		<td width=50 align="right"><?php echo $alledaten['klicks'];?>&nbsp;</td>
+		<td align="right"><?php echo number_format ($alledaten['kv'], 2, ',', '.').' '.$waehrung;?>&nbsp;</td>
+	</tr>
+	<tr bgcolor="#fafafa">
+		<td>&nbsp;<b>Betteln</b>:</td>
+		<td align="right"><?php echo $alledaten['angebettelt'];?>&nbsp;</td>
+		<td align="right"><?php echo number_format ($alledaten['bv'], 2, ',', '.').' '.$waehrung;?>&nbsp;</td>
+	</tr>
+</table>
\ No newline at end of file
diff --git a/adminforce/content/usersystem/user_include/zugang.php b/adminforce/content/usersystem/user_include/zugang.php
new file mode 100644
index 0000000..1e5dcb3
--- /dev/null
+++ b/adminforce/content/usersystem/user_include/zugang.php
@@ -0,0 +1,27 @@
+<form action="" method="POST">
+<input type="hidden" name="uid" value="<?php echo $alledaten['uid'];?>">
+<input type="hidden" name="email" value="<?php echo $alledaten['emailadresse'];?>">
+<table class="table table-striped">
+	<tr>
+		<td><b>Status</b>:<br />
+		<select name="status" size="1" style="width: 140px;">
+		<option value="0" <?php if ($alledaten['status'] == 0) echo'SELECTED';?>>Wartend</option>
+		<option value="1" <?php if ($alledaten['status'] == 1) echo'SELECTED';?>>Freigeschaltet</option>
+		<option value="2" <?php if ($alledaten['status'] == 2) echo'SELECTED';?>>Gesperrt</option>
+		<option value="<?php echo $alledaten['status'];?>">--------------</option>
+		<option value="loeschen">User l&ouml;schen</option>
+</select></td>
+	</tr>
+	<tr>
+		<td><br /><b>Hinweistext</b>:<br />
+		<textarea name="hinweis" style="width: 140px; height: 100px;"><?php echo $alledaten['hinweis'];?></textarea></td>
+	</tr>
+	<tr>
+		<td><br /><b>Mail an User</b>:<br />
+		<input checked="checked" type="radio" name="send_mail" value="ja" /> Ja &nbsp; <input type="radio" name="send_mail" value="nein" /> Nein</td>
+	</tr>
+	<tr>
+		<td align="center"><br /><input type="submit" name="access" value="&raquo; &Auml;ndern" /></td>
+	</tr>
+</table>
+</form>
\ No newline at end of file
diff --git a/adminforce/content/usersystem/userbearbeiten.php b/adminforce/content/usersystem/userbearbeiten.php
index 0e1a9cf..04fb8ac 100644
--- a/adminforce/content/usersystem/userbearbeiten.php
+++ b/adminforce/content/usersystem/userbearbeiten.php
@@ -1,21 +1,3 @@
-<script type="text/javascript">
-<!--
-function ShowUserInfo (art) {
-    /* alle container ausblenden */
-    document.getElementById("Userinfo1").style.display = 'none';
-    document.getElementById("Userinfo2").style.display = 'none';
-    document.getElementById("Userinfo3").style.display = 'none';
-    document.getElementById("Userinfo4").style.display = 'none';
-    document.getElementById("Userinfo5").style.display = 'none';
-    document.getElementById("Userinfo6").style.display = 'none';
-	document.getElementById("Userinfo7").style.display = 'none';
-    /* ausgewaehlten container einblenden */
-    document.getElementById("Userinfo" + art).style.display = 'block';
-}
--->
-</script>
-
-
 <?php
 // Variable _GET['uid'] pruefen
 if (!empty ($_GET['uid'])) $_POST['uid'] = $_GET['uid'];
@@ -92,273 +74,41 @@ $alledaten = mysqli_fetch_assoc ($sql);
 ?>
 
 <?php head ('Bearbeiten des Users <i>'.$alledaten['nickname'].'</i> ('.$alledaten['uid'].')'); ?>
-<div style="text-align: center;">
-<a href="javascript:ShowUserInfo(1);">Allgemeines</a> &middot;
-<a href="javascript:ShowUserInfo(2);">Statistik</a> &middot;
-<a href="javascript:ShowUserInfo(3);">Konto</a> &middot;
-<a href="javascript:ShowUserInfo(4);">Zugang</a> &middot;
-<a href="javascript:ShowUserInfo(5);">Buchungen</a> &middot;
-<a href="javascript:ShowUserInfo(6);">Notizen</a> &middot;
-<a href="javascript:ShowUserInfo(7);">Bettel Refferer</a>
-</div><hr size=1 style="color:#c0c0c0;">
-
-<div id="Userinfo1" style="display: block;">
-<form action="" method="POST">
-<input type="hidden" name="uid" value="<?php echo $alledaten['uid'];?>">
-<input type="hidden" name="alt_werber" value="<?php echo $alledaten['werber'];?>">
-<table width="350" border="0" cellpadding="1" cellspacing="1" align="center" bgcolor="#000000">
-	<tr bgcolor="#fafafa">
-		<td align="right"><b>User-ID</b>:&nbsp;</td>
-		<td align="left">&nbsp;<?php echo $alledaten['uid'];?></td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td align="right"><b>Nickname</b>:&nbsp;</td>
-		<td align="left">&nbsp;<input type="text" name="nickname" value="<?php echo $alledaten['nickname'];?>"></td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td align="right"><b>Werber-ID</b>:&nbsp;</td>
-		<td align="left">&nbsp;<input type="text" name="werber" value="<?php echo $alledaten['werber'];?>"></td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td align="right"><b>Vorname</b>:&nbsp;</td>
-		<td align="left">&nbsp;<input type="text" name="vorname" value="<?php echo $alledaten['vorname'];?>"></td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td align="right"><b>Nachname</b>:&nbsp;</td>
-		<td align="left">&nbsp;<input type="text" name="nachname" value="<?php echo $alledaten['nachname'];?>"></td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td align="right"><b>eMailadresse</b>:&nbsp;</td>
-		<td align="left">&nbsp;<input type="text" name="emailadresse" value="<?php echo $alledaten['emailadresse'];?>"></td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td align="right"><b>eMail-Empfang</b>:&nbsp;</td>
-		<td align="left">&nbsp;<select name="freigabe_fuer" size="1">
-		<option value="0" <?php if ($alledaten['freigabe_fuer'] == 0) echo'SELECTED';?>>Kein Empfang</option>
-		<option value="1" <?php if ($alledaten['freigabe_fuer'] == 1) echo'SELECTED';?>>Nur Newsletter</option>
-		<option value="2" <?php if ($alledaten['freigabe_fuer'] == 2) echo'SELECTED';?>>Nur Paidmails</option>
-		<option value="3" <?php if ($alledaten['freigabe_fuer'] == 3) echo'SELECTED';?>>Newsletter / Paidmails</option>
-		</select></td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td align="right">&nbsp;<b>Bettelsperre</b>:</td>
-		<td align="left">&nbsp;
-			<select name="bettel_sperre" size="1">
-				<option value="0" <?php if ($alledaten['bettel_sperre'] == 0) echo'SELECTED';?>>deaktiviert</option>
-				<option value="1" <?php if ($alledaten['bettel_sperre'] == 1) echo'SELECTED';?>>aktiviert</option>
-			</select>
-		</td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td align="right">&nbsp;<b>Banner Sperre</b>:</td>
-		<td align="left">&nbsp;
-			<select name="forced_sperre" size="1">
-				<option value="0" <?php if ($alledaten['forced_sperre'] == 0) echo'SELECTED';?>>deaktiviert</option>
-				<option value="1" <?php if ($alledaten['forced_sperre'] == 1) echo'SELECTED';?>>aktiviert</option>
-			</select>
-		</td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td align="right">&nbsp;<b>Chat Sperre</b>:</td>
-		<td align="left">&nbsp;
-			<select name="chat_sperre" size="1">
-				<option value="0" <?php if ($alledaten['chat_sperre'] == 0) echo'SELECTED';?>>deaktiviert</option>
-				<option value="1" <?php if ($alledaten['chat_sperre'] == 1) echo'SELECTED';?>>aktiviert</option>
-			</select>
-		</td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td><b>Auszahlungssperre</b></td>
-		<td>
-			<select name="auszahlung_sperre">
-				<option value="0" <?php if ($alledaten['auszahlung_sperre'] == 1) echo'SELECTED';?>>Gesperrt</option>
-				<option value="1" <?php if ($alledaten['auszahlung_sperre'] == 0) echo'SELECTED';?>>Freigeschaltet</option>
-			</select>
-		</td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td align="center" colspan="2"><br /><input type="submit" name="profile" value="&raquo; Updaten"><br />&nbsp;</td>
-	</tr>
-</table>
-</form>
-</div>
-
-<div id="Userinfo2" style="display: none;">
-<table width="350" border="0" cellpadding="1" cellspacing="1" align="center" bgcolor="#000000">
-	<tr bgcolor="#fafafa">
-		<td>&nbsp;<b>Refback</b>:</td>
-		<td colspan="2" align="right"><?php echo $alledaten['refback'];?> %&nbsp;</td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td>&nbsp;<b>Angemeldet</b>:</td>
-		<td colspan="2" align="right"><?php echo date('d.m.Y H:i', $alledaten['angemeldet_seit']);?>&nbsp;</td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td>&nbsp;<b>Letzter Login</b>:</td>
-		<td colspan="2" align="right"><?php echo date('d.m.Y H:i', $alledaten['loginzeit']);?>&nbsp;</td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td>&nbsp;<b>Letzte Aktivit&auml;t</b>:</td>
-		<td colspan="2" align="right"><?php echo date('d.m.Y H:i', $alledaten['last_active']);?>&nbsp;</td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td>&nbsp;<b>Letzte IP</b>:</td>
-		<td colspan="2" align="right"><?php echo $alledaten['login_ip'];?>&nbsp;</td>
-	</tr>
-	<tr bgcolor="#ededed">
-		<td>&nbsp;<b>ForcedKlicks</b>:</td>
-		<td width=50 align="right"><?php echo $alledaten['klicks'];?>&nbsp;</td>
-		<td align="right"><?php echo number_format ($alledaten['kv'], 2, ',', '.').' '.$waehrung;?>&nbsp;</td>
-	</tr>
-	<tr bgcolor="#fafafa">
-		<td>&nbsp;<b>Betteln</b>:</td>
-		<td align="right"><?php echo $alledaten['angebettelt'];?>&nbsp;</td>
-		<td align="right"><?php echo number_format ($alledaten['bv'], 2, ',', '.').' '.$waehrung;?>&nbsp;</td>
-	</tr>
-</table>
-</div>
-
-<div id="Userinfo3" style="display: none;">
-<form action="" method="POST">
-<input type="hidden" name="uid" value="<?php echo $alledaten['uid'];?>">
-<input type="hidden" name="email" value="<?php echo $alledaten['emailadresse'];?>">
-<table align="center" border="0" cellpadding="0" cellspacing="2">
-	<tr>
-		<td><b>Kontostand</b>:<br />
-		<?php echo number_format($alledaten['kontostand'],2,",",".").' '.$waehrung;?></td>
-	</tr>
-	<tr>
-		<td><br /><b>Summe</b>:<br />
-		<select style="width: 40px" name="buchungsart" size="1"><option value="+" SELECTED>+</option><option value="-">-</option></select><input style="width: 100px;" type="Text" name="buchungssumme" value=""></td>
-	</tr>
-	<tr>
-		<td><br /><b>Grund</b> (max. 30 Zeichen):<br />
-		<input style="width: 140px" type="text" name="buchungstext" value="" maxlength="30"></td>
-	</tr>
-	<tr>
-		<td><br /><b>Mail an User</b>:<br />
-		<input type="radio" name="send_mail" value="ja" /> Ja &nbsp; <input checked="checked" type="radio" name="send_mail" value="nein" /> Nein</td>
-	</tr>
-	<tr>
-		<td align="center"><br /><input type="submit" name="finanze" value="&raquo; Buchen" /></td>
-	</tr>
-</table>
-</form>
-</div>
-
-<div id="Userinfo4" style="display: none;">
-<form action="" method="POST">
-<input type="hidden" name="uid" value="<?php echo $alledaten['uid'];?>">
-<input type="hidden" name="email" value="<?php echo $alledaten['emailadresse'];?>">
-<table align="center" border="0" cellpadding="0" cellspacing="2">
-	<tr>
-		<td><b>Status</b>:<br />
-		<select name="status" size="1" style="width: 140px;">
-		<option value="0" <?php if ($alledaten['status'] == 0) echo'SELECTED';?>>Wartend</option>
-		<option value="1" <?php if ($alledaten['status'] == 1) echo'SELECTED';?>>Freigeschaltet</option>
-		<option value="2" <?php if ($alledaten['status'] == 2) echo'SELECTED';?>>Gesperrt</option>
-		<option value="<?php echo $alledaten['status'];?>">--------------</option>
-		<option value="loeschen">User l&ouml;schen</option>
-</select></td>
-	</tr>
-	<tr>
-		<td><br /><b>Hinweistext</b>:<br />
-		<textarea name="hinweis" style="width: 140px; height: 100px;"><?php echo $alledaten['hinweis'];?></textarea></td>
-	</tr>
-	<tr>
-		<td><br /><b>Mail an User</b>:<br />
-		<input checked="checked" type="radio" name="send_mail" value="ja" /> Ja &nbsp; <input type="radio" name="send_mail" value="nein" /> Nein</td>
-	</tr>
-	<tr>
-		<td align="center"><br /><input type="submit" name="access" value="&raquo; &Auml;ndern" /></td>
-	</tr>
-</table>
-</form>
-</div>
-
-<div id="Userinfo5" style="display: none;">
-<table class="tabellen" style="width:100%">
-<tr class="tabellenhead">
-<td align="center"><b>Buchungs Id</b></td>
-<td align="center"><b>Datum</b></td>
-<td align="center"><b>Zeit</b></td>
-<td align="center"><b><?php echo $waehrung;?></b></td>
-<td align="center"><b>Verwendungszweck</b></td>
-</tr>
-<?php
-$buchungen_lesen = db_query('SELECT * FROM '.$db_prefix.'_buchungen WHERE uid = '.$alledaten['uid'].' ORDER BY buchungszeit DESC LIMIT 250');
-while ($buchung_schreiben = mysqli_fetch_array($buchungen_lesen)) {
-$i++;
-	$buchcolor = ($buchung_schreiben['buchungsmenge'] > 0) ? '#000000' : '#cc0000';
-	$linecolor = ($i %2 == 0) ? 1 : 0;
-?>
-<tr class="tabellenbody_<?php echo $linecolor;?>">
-<td align="left">&nbsp;<?php echo $buchung_schreiben['buchungs_id'];?></td>
-<td align="center">&nbsp;<?php echo date("d.m.Y",$buchung_schreiben['buchungszeit']);?>&nbsp;</td>
-<td align="center">&nbsp;<?php echo date("H:i",$buchung_schreiben['buchungszeit']);?>&nbsp;</td>
-<td align="right">&nbsp;<font color="<?php echo $buchcolor;?>"><?php echo number_format($buchung_schreiben['buchungsmenge'],2,",",".");?></font>&nbsp;</td>
-<td align="left">&nbsp;<?php echo $buchung_schreiben['verwendungszweck'];?></td>
-</tr>
-<?php
-}
-?>
-</table>
-</div>
 
-<div id="Userinfo6" style="display: none;">
-<center>
-	<form action="" method="POST">
-		<table align="center" border="0" cellpadding="0" cellspacing="2">
-			   <tr>
-				<td><b>Notizen</b>:<br />
-				<textarea name="text" cols="50" rows="20"></textarea></td>
-			</tr>
-			<tr>
-				<td align="center"><br /><input type="submit" name="notice" value="&raquo; Speichern" /></td>
-			</tr>
-		</table>
-	</form>
-</center>
-<hr>
-<br>
-<table width="100%">
-	<tr>
-		<td></td>
-		<td>Notiz</td>
-	</tr>
-<?php
-	$da = db_query("SELECT * FROM ".$db_prefix."_user_notizen WHERE uid = '". mysqli_real_escape_string($sql_open,$_GET['uid']) ."' ");
-	while($daten = mysqli_fetch_array($da)){
-		echo '
-			<tr>
-				<td>'. date("d.m.Y", $daten['datum']) .'<br>Admin-ID: '.$daten['admin_id'] .'</td>
-				<td>'. nl2br($daten['text']) .'</td>
-			</tr>
-		';
-	}
-?>
-</table>
+<div>
+	<ul class="nav nav-tabs" role="tablist">
+		<li role="presentation" class="active"><a href="#allgemein" role="tab" data-toggle="tab">Allgemeines</a></li>
+		<li role="presentation"><a href="#statistik" role="tab" data-toggle="tab">Statistik</a></li>
+		<li role="presentation"><a href="#konto" role="tab" data-toggle="tab">Konto</a></li>
+		<li role="presentation"><a href="#zugang" role="tab" data-toggle="tab">Zugang</a></li>
+		<li role="presentation"><a href="#buchungen" role="tab" data-toggle="tab">Buchungen</a></li>
+		<li role="presentation"><a href="#notizen" role="tab" data-toggle="tab">Notizen</a></li>
+		<li role="presentation"><a href="#bet_ref" role="tab" data-toggle="tab">Bettel Refferer</a></li>
+	</ul>
+	<hr>
+	<div class="tab-content">
+		<div role="tabpanel" class="tab-pane active" id="allgemein">
+			<?php require('content/usersystem/user_include/allgemeines.php'); ?>
+		</div>
+		<div role="tabpanel" class="tab-pane" id="statistik">
+			<?php require('content/usersystem/user_include/statistik.php'); ?>
+		</div>
+		<div role="tabpanel" class="tab-pane" id="konto">
+			<?php require('content/usersystem/user_include/konto.php'); ?>
+		</div>
+		<div role="tabpanel" class="tab-pane" id="zugang">
+			<?php require('content/usersystem/user_include/zugang.php'); ?>
+		</div>
+		<div role="tabpanel" class="tab-pane" id="buchungen">
+			<?php require('content/usersystem/user_include/buchungen.php'); ?>
+		</div>
+		<div role="tabpanel" class="tab-pane" id="notizen">
+			<?php require('content/usersystem/user_include/notizen.php'); ?>
+		</div>
+		<div role="tabpanel" class="tab-pane" id="bet_ref">
+			<?php require('content/usersystem/user_include/bet_ref.php'); ?>
+		</div>
+	</div>
 </div>
 
-<div id="Userinfo7" style="display: none;">
-	<table class="tabellen" width="100%">
-		<tr class="tabellenhead">
-			<td>Zeit</td>
-			<td>Verg&uuml;tung</td>
-			<td>Refferer</td>
-		</tr>
-<?php
-		$ref = db_query("SELECT zeit,betrag,refferer FROM ".$db_prefix."_bettel_buchung WHERE uid = '".$alledaten['uid']."' ");
-		while($refferer = mysqli_fetch_array($ref)){
-			echo '
-			<tr>
-				<td>'.date("d.m.Y - H:i", $refferer['zeit']).'</td>
-				<td>'.number_format($refferer['betrag'],2,",",".").'</td>
-				<td><a href="'.$refferer['refferer'].'" target="_new">'.$refferer['refferer'].'</a></td>
-			</tr>
-			';
-		}
-?>
-	</table>
-</div>
 <?php  foot(); ?>
\ No newline at end of file
diff --git a/adminforce/index.php b/adminforce/index.php
index 0fbe224..07444d8 100644
--- a/adminforce/index.php
+++ b/adminforce/index.php
@@ -31,7 +31,7 @@ if (!ini_get('display_errors')) {
     if($_POST['check'] == "Login") {
         require_once ('../lib/functions.lib.php');
         $page = mysqli_fetch_array(db_query("SELECT admin_name, admin_pass FROM ".$db_prefix."_seitenkonfig LIMIT 1"));
-        if($_POST['loginname'] == $page['admin_name'] AND md5($_POST['passwort']) == $page['admin_pass']) {
+        if(base64_encode($_POST['loginname']) == $page['admin_name'] AND pw_erstellen($_POST['passwort']) == $page['admin_pass']) {
             $_SESSION['admin'] = 1;
             header("Location: ".$_SERVER['PHP_SELF']."?".$_SERVER['QUERY_STRING']);
         }else{
@@ -153,7 +153,7 @@ if (!ini_get('display_errors')) {
 					}
 					if($_SESSION['admin'] == 1) {
 						if(file_exists('../install')){
-							echo '<div id="meldungrot">Du musst den Ordner install noch l&ouml;schen</div>';
+							echo '<div class="alert alert-danger text-center">Du musst den Ordner install noch l&ouml;schen</div>';
 						}
 						require_once('content'.$_GET['content'].'.php');
 					}?>
diff --git a/adminforce/lib/funktionen/setting/grundeinstellung.php b/adminforce/lib/funktionen/setting/grundeinstellung.php
index 38244c8..a1d511f 100644
--- a/adminforce/lib/funktionen/setting/grundeinstellung.php
+++ b/adminforce/lib/funktionen/setting/grundeinstellung.php
@@ -7,6 +7,12 @@
 	if($_POST['anzeige_text'] == 'on'){ $anzeige_text = 1;}else{ $anzeige_text = 0;}
 	
 	if($meldung['error'] == 0){
+		$_POST['re1'] = str_replace(",",".",$_POST['re1']);
+		$_POST['re2'] = str_replace(",",".",$_POST['re2']);
+		$_POST['re3'] = str_replace(",",".",$_POST['re3']);
+		$_POST['verdienst_start'] = str_replace(",",".",$_POST['verdienst_start']);
+		$_POST['min_betteln'] = str_replace(",",".",$_POST['min_betteln']);
+		$_POST['max_betteln'] = str_replace(",",".",$_POST['max_betteln']);
 		$update = db_query("UPDATE ".$db_prefix."_seitenkonfig SET
 					 denied_domains='".$_POST['denied_domains']."',
 					 wartung='".$wartung."',
@@ -29,7 +35,8 @@
 					 waehrung_zwei = '". $_POST['waehrung_zwei'] ."',
 					 buchungen_loeschen = '". $_POST['buchungen_loeschen'] ."',
 					 buchungen_loeschen_tage = '". $_POST['buchungen_loeschen_tage'] ."',
-					 auszahlung_sperre = '". $_POST['auszahlung_sperre'] ."'
+					 auszahlung_sperre = '". $_POST['auszahlung_sperre'] ."',
+					 verdienst_start = '". $_POST['verdienst_start'] ."'
 					 ");
 	
 			if($update == true){
diff --git a/content/verdienen/forcedbanner.php b/content/verdienen/forcedbanner.php
index fa64383..01134ed 100644
--- a/content/verdienen/forcedbanner.php
+++ b/content/verdienen/forcedbanner.php
@@ -13,10 +13,10 @@ include ('fakecheck/fc_redirect.php');
                			LEFT JOIN vms_fb_blacklist AS t3 ON t3.kid = t1.kid AND t3.werbeart=t1.werbeart
                         LEFT JOIN vms_reloads t2 ON (t1.tan = t2.tan AND (t2.uid = '.$_SESSION['uid'].' OR t2.ip = "'.$ip.'") AND t2.bis >= '.time().')
                         WHERE (t3.kid IS NULL OR LOCATE(t3.sponsor, t1.ziel) = 0) AND t4.tan IS NULL AND t2.tan IS NULL AND t1.werbeart = "forcedbanner" and t1.reload >= 100 AND t1.menge > 0 AND t1.status = 1 AND t1.verdienst >= 0 AND t1.sponsor != '.$_SESSION['uid'].''));
-    $uebriga=100/$fstats_gesamt['ganzahl']*$fstats_uebrig['uanzahl'];
+	$uebriga=100/$fstats_gesamt['ganzahl']*$fstats_uebrig['uanzahl'];
     $uebrig=number_format($uebriga,2,',','.');
     $abgebaut= 100-$uebriga;
-    echo "<table cellspacing='4' cellpadding='0' width='100%'>
+    echo "<table class=\"table\">
         <tr>
         <td align='center''>Paidbanner gesamt: ".$fstats_gesamt['ganzahl']."</td>
         <td>&nbsp;&nbsp;</td>
@@ -45,7 +45,7 @@ include ('fakecheck/fc_redirect.php');
                                         ORDER BY r.bis ASC LIMIT 1'));
     $zeit = ((($res['bis']-time()) >= 0) ? ($res['bis']-time()) : NULL );
     if ($zeit != NULL){
-        echo '<center>Der naechste Banner kommt in '.ceil($zeit/60).' Minuten aus dem Reload!</center><hr><br>';
+        echo '<center>Der n&auml;chste Banner kommt in '.ceil($zeit/60).' Minuten aus dem Reload!</center><hr><br>';
     }else echo '<center>Kein Banner im Reload.</center><hr><br>';
 
 	if($sperre['forced_sperre'] == 0){
@@ -65,8 +65,8 @@ include ('fakecheck/fc_redirect.php');
 		}
 
 		if (mysqli_num_rows ($fbanner) > 0) echo '<div align="center"><input type="button" name="mehr_banner" value="Weitere Banner !" onclick="javascript:location.reload();" /></div>';
-		else echo '<div style="text-align: center; font-weight: bold; color: #ff0000;">Alle Banner im Reload !</div>';
+		else echo '<div class="alert alert-warning text-center">Alle Banner im Reload !</div>';
 	}else{
-		echo '<div style="text-align: center; font-weight: bold; color: #ff0000;">Du bist f&uuml;r den Klickbereich gesperrt.</div>';
+		echo '<div class="alert alert-danger text-center">Du bist f&uuml;r den Klickbereich gesperrt.</div>';
 	}
 foot ();
\ No newline at end of file
diff --git a/install/index.php b/install/index.php
index edbd405..56e0100 100644
--- a/install/index.php
+++ b/install/index.php
@@ -136,12 +136,11 @@ if(isset($_POST['zugangsdaten_festlegen'])){
 	if($fehler != 1){
 		require_once('../lib/datenbank.inc.php');
 		$nickname = $_POST['user_name'];
-		$passwort = md5($_POST['user_pass']);
-		$admin_pass = md5($_POST['admin_pass']);
+		$passwort = pw_erstellen($_POST['user_pass']);
 		$admin_name = base64_encode($_POST['admin_name']);
 		db_query("UPDATE ".$db_prefix."_kontodaten SET passwort = '". $passwort ."' WHERE uid = '1' ");
 		db_query("UPDATE ".$db_prefix."_userdaten SET nickname = '". $nickname ."' WHERE uid = '1' ");
-		db_query("UPDATE ".$db_prefix."_seitenkonfig SET admin_name = '". $admin_name ."', admin_pass = '". $admin_pass ."' ");
+		db_query("UPDATE ".$db_prefix."_seitenkonfig SET admin_name = '". $admin_name ."', admin_pass = '". $passwort ."' ");
 	}
 }
 
diff --git a/lib/functions.lib.php b/lib/functions.lib.php
index 5c4a1af..9d9ce3f 100644
--- a/lib/functions.lib.php
+++ b/lib/functions.lib.php
@@ -56,7 +56,7 @@ function create_code($code_laenge) {
  * @param int $fuer Userid
  * @return keine
  */
-function kontobuchung ($art, $trans_menge, $buchungs_id, $fuer, $waehrung, $verwendung) {
+function kontobuchung ($art, $trans_menge, $buchungs_id, $fuer, $verwendung) {
     global $db_prefix,$sql_open;
 	$buchung = db_query("UPDATE " . $db_prefix . "_kontodaten SET `kontostand` = `kontostand` " . mysqli_real_escape_string($sql_open,$art) . " " . mysqli_real_escape_string($sql_open,$trans_menge) . " WHERE uid=" . mysqli_real_escape_string($sql_open,$fuer) . "");
 	if($buchung == true){
diff --git a/lib/funktionen/chat.php b/lib/funktionen/chat.php
index 433f459..df1985c 100644
--- a/lib/funktionen/chat.php
+++ b/lib/funktionen/chat.php
@@ -21,13 +21,11 @@ if($meldung['error'] == 0){
 		$daten = mysqli_fetch_array(db_query("SELECT sb_reload,sb_verguetung FROM ".$db_prefix."_chat_einstellungen "));
 			if($_COOKIE['adblocker'] == 1){
 				$verguetung = $daten['sb_verguetung']/2;
-				buchungsliste (create_code(14), $verguetung, 'Chat Verg&uuml;tung', $_SESSION['uid']);
-				kontobuchung ('+', $daten['sb_verguetung'], $_SESSION['uid']);
+				kontobuchung ('+', $verguetung/2, create_code(14), $_SESSION['uid'],'Chatverg&uuml;tung');
 				$meldung = array("error" => 0, "meldung" => 'Da du deinen Adblocker an hast, bekommst du nicht die ganze Chat Verg&uuml;tung.<br>
 																Du bekommst nur '. number_format($verguetung/2,2,',','.').' '.$waehrung.' anstatt die vollen '. number_format($verguetung,2,',','.').' '.$waehrung.'.');
 			}else{
-				buchungsliste (create_code(14), $daten['sb_verguetung'], 'Chat Verg&uuml;tung', $_SESSION['uid']);
-				kontobuchung ('+', $daten['sb_verguetung'], $_SESSION['uid']);
+				kontobuchung ('+', $daten['sb_verguetung'], create_code(14), $_SESSION['uid'],'Chatverg&uuml;tung');
 				$meldung = array("error" => 0, "meldung" => 'Chat Verg&uuml;tung erhalten.');
 			}
 			db_query("UPDATE ".$db_prefix."_kontodaten SET sb_verdienst = sb_verdienst + '".$daten['sb_verguetung']."' WHERE uid = '".$_SESSION['uid']."' ");
-- 
GitLab