Release 0.0.9

Login problem bei Admin behoben
Bug #15

CHANGELOG

 # Was alles passiert
 
+## [0.1.0]
+
+##geupdatet
+
+##gelöscht
+
+##hinzugefügt
+- neue Refebenen Verwaltung im Admin
+
+##Bugs
+
 ## [0.0.9]
 
 ##geupdatet

adminforce/index.php

@@ -27,22 +27,6 @@
     $shows = 0;
     if (!isset($_GET['page'])) $_GET['page'] = '/startseite';
     if (!file_exists('page'.$_GET['page'].'.php')) $_GET['page'] = '/error/keine_seite';
-    if(isset($_POST['check'])){
-		if($_POST['check'] == "Login") {
-			require_once ('../lib/functions.lib.php');
-			$page = $datenbank->get_row("SELECT admin_name, admin_pass FROM ". PREFIX . CONFIG ." LIMIT 1",true);
-			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{
-				?>
-				<script>
-				alert("Fehler beim Einloggen");
-				</script>
-				<?php
-			}
-		}
-    }
 
 ?>
 
@@ -136,7 +120,7 @@
 									<input type="Text" class="form-control" name="loginname" value="'.$_POST['loginname'].'" placeholder="Username">
 									<input type="Password" class="form-control" name="passwort" value="" placeholder="Passwort">
 									<div class="input-group-append">
-										<input type="submit" name="check" value="Login" class="btn btn-primary">
+										<input type="submit" name="checkAdmin" value="Login" class="btn btn-primary">
 									</div>
 								</div>
 									

adminforce/lib/class/grundeinstellung.class.php

 <?php
 
-class GRUNDSETTING{
+class grundeinstellung{
 	private $db;
 	private $post = array();
 	private $error = 0;
 	private $meldung = '';
+	private $config;
 	
 	function __construct(){
-		global $datenbank;
+		global $datenbank,$grundconfig;
 		$this->db = $datenbank;
+		$this->config = $grundconfig;
 	}
 	
 	public function Save($post){
@@ -33,4 +35,49 @@ class GRUNDSETTING{
 			}
 		}
 	}
-}
+	
\ No newline at end of file
+	public function Refliste(){
+		$aus = '<form method="post" action="">
+			<div class="form-group">
+				<label for="exampleInputEmail1">Anzahl Refebenen</label>
+				<input type="number" class="form-control" name="refEbenen" value="'.$this->config->RefEbenen .'">
+				<small id="emailHelp" class="form-text text-muted">Sollten es mehr Refebenen werden, bitte erst die Anzahl Speichern und dann die Verg&uuml;tungen eintragen</small>
+			</div>
+			<div class="row">';
+		$ii = 1;
+		$explode = explode(";",$this->config->RefVerg);
+		for($i = 1; $i <= $this->config->RefEbenen; $i++){
+			if(isset($explode[$i-1])){ $eexplode = $explode[$i-1];}else{ $eexplode = 0;}
+			$aus .= '
+			<div class="col">
+				<div class="input-group mb-3">
+					<div class="input-group-prepend">
+						<span class="input-group-text" id="basic-addon1">Ebene '. $i .'</span>
+					</div>
+					<input type="text" class="form-control text-right" name="refebenen['.$i.']" value="'. $eexplode .'">
+					<div class="input-group-append">
+						<span class="input-group-text" id="basic-addon1">%</span>
+					</div>
+				</div>
+			</div>';
+			if($ii == 5){
+				$aus .= '</div><div class="row">';
+				$ii = 1;
+			}else{
+				$ii++;
+			}
+		}
+		$aus .= '<input type="hidden" name="keine_ebene" value="1298753t624"></div><input type="submit" name="refebenenSave" value="Speichern" class="btn btn-success btn-block"></form>';
+		return $aus;
+	}
+	
+	public function RefVergSave($post){
+		if(is_numeric($post['refEbenen'])){ $RefEbenen = $post['refEbenen'];}else{ $RefEbenen = 0;}
+		if(empty($post['refebenen'])){ $refebenen = '';}else{ $refebenen = implode(";",$post['refebenen']);}
+		if($this->db->update(PREFIX . CONFIG, array("RefEbenen" => $RefEbenen, "RefVerg" => $refebenen), array("id" => 1)) == true){
+			meldung(0,REFEBENEN_SAVE_TRUE);
+		}else{
+			meldung(1,REFEBENEN_SAVE_FALSE);
+		}
+	}
+}

adminforce/lib/funktionen/AdminLogin.php

+<?php
+
+if(isset($_POST['checkAdmin'])){
+		if($_POST['checkAdmin'] == "Login") {
+			require_once ($_SERVER['DOCUMENT_ROOT'].'/lib/functions.lib.php');
+			$page = $datenbank->get_row("SELECT admin_name, admin_pass FROM ". PREFIX . CONFIG ." LIMIT 1",true);
+			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{
+				?>
+				<script>
+				alert("Fehler beim Einloggen");
+				</script>
+				<?php
+			}
+		}
+    }
+
+?>

adminforce/lib/funktionen/setting/grundeinstellung.php

 <?php
-require_once('lib/class/grundeinstellung.class.php');
-$grund = new GRUNDSETTING;
+$grund = Classloader('grundeinstellung');
 $grund->Save($_POST);
-?>
+?>
\ No newline at end of file

adminforce/lib/funktionen/setting/ref.php

+<?php
+
+$ref = Classloader('grundeinstellung',true);
+$ref->RefVergSave($_POST);

adminforce/lib/lang/lang.de.php

@@ -4,6 +4,8 @@
 	define("DOPPEL_PASS_FALSE","Es wurden keine doppelten Passw&ouml;rter gefunden.<br>");
 	define("PAGECONFIG_SAVE_TRUE","Die Daten wurden erfolgreich gespeichert.<br>");
 	define("PAGECONFIG_SAVE_FALSE","Speichern fehlerhaft<br>");
+	define("REFEBENEN_SAVE_TRUE","Speichern der Refebenen Erfolgreich.<br>");
+	define("REFEBENEN_SAVE_FALSE","Speichern der Refebenen fehlgeschlagen.<br>");
 
 //Betreiberdaten
 	define("POST_PRUEF_BETREIBERDATEN_BID_FALSE","Bitte eine g&uuml;ltige Betreiber ID eingeben.<br>");

adminforce/lib/run.inc.php

@@ -19,8 +19,6 @@ if($_SERVER["REQUEST_METHOD"] == "POST" && !isset($_POST['login'])){
 //Einstellungen
 	//Geburtstagsaddon
 	if(isset($_POST['geb_save']) && $_SESSION['admin'] == 1){ require('lib/funktionen/setting/geburtstag.php');}
-	//Admin Zugangsdaten
-	if(isset($_POST['admin']) && $_SESSION['admin'] == 1){ require('lib/funktionen/setting/admin.php');}
 //Texte
 	//Bezahlte Startseite
 	if(isset($_POST['start_bezahlt_save']) && $_SESSION['admin'] == 1){ require('lib/funktionen/texte/bezahlte_startseite.php');}

adminforce/page/interfacedaten/config_include/admin_pw.php

@@ -14,9 +14,9 @@
 					<td><input class="form-control" type="Text" name="admin_pass"></td>
 				</tr>
 				<tr>
-					<td align="center" colspan="2"><input class="btn btn-default" type="Submit" name="admin" value="Zugangsdaten &Auml;ndern"></td>
+					<td align="center" colspan="2"><input class="btn btn-default" type="Submit" name="adminPW" value="Zugangsdaten &Auml;ndern"></td>
 				</tr>
 			</table>
 		</form>
 	</div>
-</div>
+</div>
\ No newline at end of file

adminforce/page/interfacedaten/config_include/ref.php

+<?php
 
+$ref = Classloader('grundeinstellung',true);
+
+echo $ref->Refliste();
+
+?>

adminforce/page/interfacedaten/pageconfig.php

@@ -10,8 +10,8 @@ head("Webseiteneinstellungen"); ?>
 		<li role="presentation" class="nav-item"><a href="#start" class="nav-link active" role="tab" data-toggle="tab">Seiteneinstellung</a></li>
 		<li role="presentation" class="nav-item"><a href="#waehrung" class="nav-link" role="tab" data-toggle="tab">W&auml;hrung</a></li>
 		<li role="presentation" class="nav-item"><a href="#nutzer" class="nav-link" role="tab" data-toggle="tab">Nutzer</a></li>
-		<li role="presentation" class="nav-item"><a href="#ref" class="nav-link" role="tab" data-toggle="tab">Refeinstellung</a></li>
 		<li role="presentation" class="nav-item"><a href="#smtp" class="nav-link" role="tab" data-toggle="tab">SMTP</a></li>
+		<li role="presentation" class="nav-item"><a href="#ref" class="nav-link" role="tab" data-toggle="tab">Refeinstellung</a></li>
 		<li role="presentation" class="nav-item"><a href="#admin_pw" class="nav-link" role="tab" data-toggle="tab">Admin PW</a></li>
 	</ul>
 	<br>
@@ -19,27 +19,28 @@ head("Webseiteneinstellungen"); ?>
 		<div class="tab-content">
 			<div role="tabpanel" class="tab-pane fade show active" id="start">
 				<?php require('page/interfacedaten/config_include/sitesetting.php');?>
+				<input type="submit" name="updaten" value="Updaten !" class="btn btn-default">
 			</div>
 			<div role="tabpanel" class="tab-pane" id="waehrung">
 				<?php require('page/interfacedaten/config_include/waehrung.php');?>
+				<input type="submit" name="updaten" value="Updaten !" class="btn btn-default">
 			</div>
 			<div role="tabpanel" class="tab-pane" id="nutzer">
 				<?php require('page/interfacedaten/config_include/nutzer.php');?>
-			</div>
-			<div role="tabpanel" class="tab-pane" id="ref">
-				<?php require('page/interfacedaten/config_include/ref.php');?>
+				<input type="submit" name="updaten" value="Updaten !" class="btn btn-default">
 			</div>
 			<div role="tabpanel" class="tab-pane" id="smtp">
 				<?php require('page/interfacedaten/config_include/smtp.php');?>
+				<input type="submit" name="updaten" value="Updaten !" class="btn btn-default">
+			</div>
+	</form>
+			<div role="tabpanel" class="tab-pane" id="ref">
+				<?php require('page/interfacedaten/config_include/ref.php');?>
 			</div>
 			<div role="tabpanel" class="tab-pane" id="admin_pw">
 				<?php require('page/interfacedaten/config_include/admin_pw.php');?>
 			</div>
 		</div>
-		<div class="text-center">
-			<input type="submit" name="updaten" value="Updaten !" class="btn btn-default">
-		</div>
-	</form>
 </div>
 
 <?php foot(); ?>

install/install.class.php

@@ -59,6 +59,7 @@ class Install{
 	public function DBStrucktur($query){
 		$this->DBConnect();
 		if(!empty($query) && $query != ''){
+			$query = str_replace("vms_",PREFIX,$query);
 			if($this->db->queryInstall($query)== true){
 				echo  '<div class="alert alert-success">Befehl: '. $query .' erfolgreich</div>';
 			}

lib/class/ref.class.php

@@ -5,41 +5,33 @@ class ref{
 	private $config;
 	private $verdienst = 0;
 	private $konto;
+	private $verg = array();
 	
 	function __construct(){
 		global $datenbank,$k_buchung;
-		
 		$this->db = $datenbank;
 		$this->config = $this->db->get_row("SELECT * FROM ". PREFIX . CONFIG ." ",true);
 		$this->konto = $k_buchung;
+		$explode = explode(";",$this->config->RefVerg);
+		for($i = 1; $i <= $this->config->RefEbenen; $i++){
+			$this->verg[$i] = $explode[$i-1];
+		}
 	}
 	
 	public function UserListe(){
 		foreach($this->db->get_results("SELECT * FROM ". PREFIX . WERBER ." WHERE werber != '0' ") AS $res){
-			$this->Ebene1($res);
+			$this->Ebenverguetung($res->uid,$res->werber,1,$res);
 		}
 	}
 	
-	private function Ebene1($res){
-		$werberverdienst = $res->umsatz / 100 * $this->config->re1;
-		$this->konto->set_var($res->werber,$werberverdienst,'+','Ref-Verdienst (User: '. $res->uid .')');
-		if($res->refback != 0){
-			$refback = $werberverdienst / 100 * $res->refback;
-			$this->konto->set_var($res->werber,$refback,'-','Ref-Refback (User: '. $res->uid .')');
-			$this->konto->set_var($res->uid,$refback,'+','Refback');
-		}
-		$this->db->update(PREFIX . WERBER, array("gesamt" => $res->gesamt + $res->umsatz, "umsatz" => 0), array("uid" => $res->uid),1 );
-		$query = "SELECT * FROM ". PREFIX . WERBER ." WHERE werber = '$res->uid' ";
-		if($this->db->num_rows($query) > 0){
-			$this->Ebene2($this->db->get_row($query,true));
+	private function Ebenverguetung($uid,$werber,$ebene,$ressourcen){
+		//Bezahlung von Werber in Grundstufe
+		$verguetung = $ressourcen->umsatz /100 * $this->verg[$ebene];
+		$query = "SELECT * FROM ". PREFIX . WERBER ." WHERE werber = '$uid' ";
+		if($this->db->num_rows($query) != 0){
+			foreach($this->db->get_results($query) AS $res){
+				$this->Ebenverguetung($res->uid,$werber,$ebene++,$res);
+			}
 		}
 	}
-	
-	private function Ebene2($uid){
-		
-	}
-	
-	private function Ebene3($uid){
-		
-	}
 }

lib/functions.lib.php

@@ -246,8 +246,10 @@ function userinfo($uid){
 }
 
 function Classloader($class,$admin = false){
-	if(file_exists($_SERVER['DOCUMENT_ROOT'].'/lib/class/'.$class .'.class.php')){
-		require_once($_SERVER['DOCUMENT_ROOT'].'/lib/class/'.$class .'.class.php');
+	$adminfolder = '';
+	if($admin == true){ $adminfolder = '/adminforce';}
+	if(file_exists($_SERVER['DOCUMENT_ROOT'].$adminfolder.'/lib/class/'.$class .'.class.php')){
+		require_once($_SERVER['DOCUMENT_ROOT'].$adminfolder.'/lib/class/'.$class .'.class.php');
 		$reg = new $class;
 	}else{
 		$reg = 'error';