Merge branch 'testing' of git.iamfabulous.de:jungegemeinde into testing

1 files changed, 80 insertions, 1 deletions

diff --git a/functions.php b/functions.php
index ea23224..09118a4 100644
--- a/functions.php
+++ b/functions.php
@@ -49,7 +49,8 @@ if( isset($_GET["goto"]) && $_GET["goto"] != "" ) {
 		redirect("index");
 	}
 ?>
-<form class="form-horizontal" method="POST" action="<?php echo DOMAIN; ?>?page=action&task=login&goto=<?php echo $goto; ?>">
+<!--form class="form-horizontal" method="POST" action="<?php echo DOMAIN; ?>?page=action&task=login&goto=<?php echo $goto; ?>"-->
+<form class="form-horizontal" method="POST" action="<?php echo DOMAIN; ?>?page=action&task=genHash&goto=<?php echo $goto; ?>">
 <fieldset>
 
 <!-- Form Name -->
@@ -75,6 +76,7 @@ if( isset($_GET["goto"]) && $_GET["goto"] != "" ) {
 ?>
 </legend>
 
+<?php /*
 <!-- Text input-->
 <div class="form-group">
   <label class="col-md-4 control-label" for="name">Username*</label>  
@@ -107,6 +109,24 @@ if( isset($_GET["goto"]) && $_GET["goto"] != "" ) {
 <div class="row">
 <a href="<?php echo DOMAIN; ?>?page=recover" title="Recover your password">[Passwort vergessen?]</a>
 </div>
+ */ ?>
+
+<div class="form-group">
+  <label class="col-md-4 control-label" for="name">E-Mail</label>  
+  <div class="col-md-4">
+  <input id="name" name="name" placeholder="Deine E-Mail Adresse" class="form-control input-md" required="" type="text">
+  </div>
+</div>
+
+<div class="form-group">
+  <label class="col-md-4 control-label" for="submit"></label>
+  <div class="col-md-4">
+    <button id="submit" name="submit" class="btn btn-info"><span class="glyphicon glyphicon-log-in"></span> Lass mich rein</button>
+  </div>
+</div>
+
+
+
 <?php
 }
 
@@ -1103,3 +1123,62 @@ function rrmdir($dir) {
 		rmdir($dir); 
 	} 
 }
+
+function print_verify_by_email($option = false){
+if( isset($_GET["goto"]) && $_GET["goto"] != "" ) {
+	$goto = htmlentities($_GET["goto"]);
+
+} else {
+	$goto = "index";
+}
+
+	global $user;
+	if ( $user->isLoggedIn() ){
+		redirect("index");
+	}
+?>
+<!--form class="form-horizontal" method="POST" action="<?php echo DOMAIN; ?>?page=action&task=login&goto=<?php echo $goto; ?>"-->
+<form class="form-horizontal" method="GET" action="<?php echo DOMAIN; ?>?page=action&task=genHash&goto=<?php echo $goto; ?>">
+<fieldset>
+
+<!-- Form Name -->
+<legend><h1>Junge Gemeinde Adlershof</h1>
+<?php
+	if ( ! $option ){
+?>
+<p>Login required</p>
+<?php
+	} else if ( $option == "logout" ){
+?>
+<p style="color:red">Logout erfolgreich!</p>
+<?php
+	} else if ( $option == "password" ) {
+?>
+<p style="color:red">Nutzer/Passwort falsch</p>
+<?php
+	} else if ( $option == "missing") {
+?>
+<p style="color:red">Bitte fülle alle Felder aus!</p>
+<?php
+	}
+?>
+</legend>
+
+<div class="form-group">
+  <label class="col-md-4 control-label" for="name">Hash</label>  
+  <div class="col-md-4">
+  <input id="name" name="name" placeholder="Deine E-Mail Adresse" class="form-control input-md" required="" type="text">
+  </div>
+</div>
+
+<div class="form-group">
+  <label class="col-md-4 control-label" for="submit"></label>
+  <div class="col-md-4">
+    <button id="submit" name="submit" class="btn btn-info"><span class="glyphicon glyphicon-log-in"></span> Lass mich rein</button>
+  </div>
+</div>
+
+
+
+<?php
+}