hft-informatik/internetprogrammierung
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge branch 'master' of https://github.com/iCaotix/ipr-projekt"

Browse Source 
This reverts commit ebb6e4eed7, reversing
changes made to 40398a6939.
This commit is contained in:
Marcel Schwarz 2018-06-11 17:42:44 +02:00
parent ebb6e4eed7
commit 6e8ff050fd
9 changed files with 25 additions and 304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
index.php
View File

@ -10,10 +10,8 @@
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
</head>
<body>
<!-- Include the header-->
<?php include('segments/_header.html'); ?>
<<<<<<< HEAD
@ -44,21 +42,11 @@
<?php echo $_POST["entryGame"]; ?><br>
<?php echo $_POST["entryTrinkspiel"]; ?><br>
=======
<div id="content">
<button id="btnCreateTan" type="button" class="btn btn-info">Erstelle Tan</button>
</div>
>>>>>>> 268a8ea290224c0d4de615683d4c8529df7d5252
<!-- Zum testen der Daten die ueber die Modals reinkommen -->
<!-- <?php include('segments/_indexTestLoginVals.php'); ?> -->
<!-- Include the entryForm-->
<?php include('segments/_entryForm.php'); ?>
<!-- Include the footer-->
<?php include('segments/_footer.html'); ?>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->

19
js/contentloader.js
View File

@ -1,7 +1,7 @@
window.addEventListener('load', async () => {
console.log("Seite geladen");
//getNewUniqueLink();
document.getElementById('btnCreateTan').addEventListener('click' , async (event) => getNewUniqueLink());
getNewUniqueLink();
document.getElementById('create').addEventListener('click' , async (event) => createEntry());
})
async function getNewUniqueLink() {
@ -16,3 +16,18 @@ async function getNewUniqueLink() {
}
}
async function createEntry() {
event.preventDefault()
const formData = new formData(document.getElementById('create-form'));
try {
const response = await fetch('php/login.php', {
method: 'post',
body: formData
});
const jsonData = await response.json();
} catch (e) {
console.log("Fehler");
}
}

0
js/entry.js Normal file
View File

23
php/generateLink.php
View File

@ -8,39 +8,22 @@
insertTan($uniqueID);
$resultStr = getTanID($uniqueID);
$HTMLJSON = array('html' => $resultStr);
echo json_encode($HTMLJSON);
function insertTan($tan) {
require('../dbConnect.php'); //Erstellt variable mit dem namen $database
$stmt = $database->prepare("INSERT INTO tans (tan, userID, used) VALUES (?, ?, ?)");
$stmt = $database->prepare("INSERT INTO tans (tan, used) VALUES (?, ?)");
$used = false;
$userid = 1;
$stmt->bind_param("ssi", $tan, $userid, $used);
$false = false;
$stmt->bind_param("si", $tan, $false);
try {
$stmt->execute();
$database->close();
} catch (PDOException $e) {
$e->getMessage();
}
}
function getTanID($tan){
require('../dbConnect.php'); //Erstellt variable mit dem namen $database
$abfrage = "SELECT `id` FROM `tans` WHERE `tan` = '" . $tan . "'";
$ergebnis = mysqli_query($database, $abfrage);
$row = $ergebnis->fetch_object();
$resultStr = $row->id;
return $resultStr;
}
?>

3
readme.md
View File

@ -1,3 +1,6 @@
Link to Project:
https://icaotix.github.io/ipr-projekt/
Info: index.php
form with php_post in line 61 and 97, feel free to change the destination path.

225
segments/_entryForm.php
View File

@ -1,225 +0,0 @@
<?php
if(isset($_POST['tanID'])){
//echo "Tan ->" . $_POST['tan'] . "<-";
if($_POST['tanID'] != ""){
addEntry();
consumeTan($_POST['tanID']);
}
}
function addEntry() {
}
function consumeTan($tanID) {
require('dbConnect.php'); //Erstellt variable mit dem namen $database
//Stelle sicher dass die Tan noch verfügbar ist.
$abfrage = "SELECT `used`, `tan` FROM `tans` WHERE `id` = '" . $tanID . "'";
$ergebnis = mysqli_query($database, $abfrage);
if($ergebnis->num_rows == 0){
echo "Tan nicht vergeben";
return;
}
$resultStr = "";
$row = $ergebnis->fetch_object();
if($row->used == 1){
echo "Tan schon verbraucht";
return;
}
//Setzte Tan auf verbraucht
$update = $database->query("UPDATE `tans` SET `used`= true WHERE `id` = '" . $_POST['tanID'] . "'");
echo "Tan verbraucht " . $_POST['tanID'];
}
?>
<!-- Container fuer entry form-->
<div class="container">
<div class="row">
<div class="col-12">
<form id="entry-form" action="index.php" method="post">
<!-- Vorname-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Vorname*</span>
</div>
<input type="text" class="form-control" name="entryVorname" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Nachname-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Nachname*</span>
</div>
<input type="text" class="form-control" name="entryNachname" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Geburtstag-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Geburtstag</span>
</div>
<input type="text" class="form-control" name="entryGeburtstag" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Wohnort-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Wohnort</span>
</div>
<input type="text" class="form-control" name="entryOrt" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Strasse-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Straße</span>
</div>
<input type="text" class="form-control" name="entryStraße" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Woher kennen-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Woher kennen wir uns?*</span>
</div>
<input type="text" class="form-control" name="entryKennen" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Festnetz-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Festnetz</span>
</div>
<input type="text" class="form-control" name="entryFestnetz" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Handynummer-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Handynummer</span>
</div>
<input type="text" class="form-control" name="entryHandy" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- E-Mail-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">E-Mail*</span>
</div>
<input type="text" class="form-control" name="entryMail" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Hobbies-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Hobbies</span>
</div>
<input type="text" class="form-control" name="entryHobbies" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Berufswunsch-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Berufswunsch</span>
</div>
<input type="text" class="form-control" name="entryBeruf" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Essen-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Das könnte ich jeden Tag essen</span>
</div>
<input type="text" class="form-control" name="entryEssen" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Insel-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Was ich auf eine Insel mitnehmen würde</span>
</div>
<input type="text" class="form-control" name="entryInsel" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Film-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Lieblingsfilm</span>
</div>
<input type="text" class="form-control" name="entryFilm" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Sport-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Lieblingssport</span>
</div>
<input type="text" class="form-control" name="entrySport" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Charaker-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Coolster Film oder Spielecharaker</span>
</div>
<input type="text" class="form-control" name="entryCharakter" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Tier -->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Mein Lieblingstier</span>
</div>
<input type="text" class="form-control" name="entryTier" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Musik -->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Lieblingsmusik(Genre, Interpret, Titel)</span>
</div>
<input type="text" class="form-control" name="entryMusik" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Game -->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Geilstes Game</span>
</div>
<input type="text" class="form-control" name="entryGame" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Alk-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Lieblings alkoholisches Getränk</span>
</div>
<input type="text" class="form-control" name="entryAlk" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Story-->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Meine heftigste Suffstory</span>
</div>
<input type="text" class="form-control" name="entryStory" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Absturz -->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Letzer Absturz</span>
</div>
<input type="text" class="form-control" name="entryAbsturz" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Trinkspiel -->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Lieblings Trinkspiel</span>
</div>
<input type="text" class="form-control" name="entryTrinkspiel" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- TAN -->
<div class="input-group input-group-sm mb-3">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-sm">Eintrags-TAN*</span>
</div>
<input type="text" class="form-control" name="tanID" aria-label="Small" aria-describedby="inputGroup-sizing-sm">
</div>
<!-- Absenden Button-->
<div class="modal-footer">
<button id="btnAbsenden" type="submit" class="btn btn-primary">Absenden</button>
</div>
</fo+rm>
</div>
</div>
</div> <!-- Ende container entry form -->

10
segments/_indexTestLoginVals.php
View File

@ -1,10 +0,0 @@
<div id="phpTest">
LoginModalData:
Welcome <?php echo $_POST["loginName"]; ?><br>
Your Password is: <?php echo $_POST["loginPassword"]; ?><br>
<br>
RegisterModalData:
Welcome <?php echo $_POST["registerName"]; ?><br>
Your Password is: <?php echo $_POST["registerPassword"]; ?><br>
Your Mail Adress is: <?php echo $_POST["registerMail"]; ?><br>
</div>

33
sql/entiresTable.sql
View File

@ -1,33 +0,0 @@
CREATE TABLE `kd42696_ipr-projekt`.`entries` (
`id` INT NOT NULL AUTO_INCREMENT ,
`userID` INT NOT NULL ,
`tanID` INT NOT NULL ,
`vorname` LONGTEXT NOT NULL ,
`nachname` LONGTEXT NOT NULL ,
`geburtstag` LONGTEXT NOT NULL ,
`wohnort` LONGTEXT NOT NULL ,
`strasse` LONGTEXT NOT NULL ,
`kennenUns` LONGTEXT NOT NULL ,
`festnetz` LONGTEXT NOT NULL ,
`handynummer` LONGTEXT NOT NULL ,
`email` LONGTEXT NOT NULL ,
`hobbies` LONGTEXT NOT NULL ,
`berufswunsch` LONGTEXT NOT NULL ,
`essen` LONGTEXT NOT NULL ,
`insel` LONGTEXT NOT NULL ,
`film` LONGTEXT NOT NULL ,
`sport` LONGTEXT NOT NULL ,
`charakter` LONGTEXT NOT NULL ,
`tier` LONGTEXT NOT NULL ,
`musik` LONGTEXT NOT NULL ,
`game` LONGTEXT NOT NULL ,
`alk` LONGTEXT NOT NULL ,
`story` LONGTEXT NOT NULL ,
`absturz` LONGTEXT NOT NULL ,
`trinkspiel` LONGTEXT NOT NULL ,
PRIMARY KEY (`id`),
UNIQUE (`userID`),
UNIQUE (`tanID`)) ENGINE = InnoDB;
ALTER TABLE `entries` ADD FOREIGN KEY (`userID`) REFERENCES `user`(`ID`) ON DELETE CASCADE ON UPDATE CASCADE;
ALTER TABLE `entries` ADD FOREIGN KEY (`tanID`) REFERENCES `tans`(`id`) ON DELETE CASCADE ON UPDATE CASCADE;

4
sql/userTable.sql → sql/userTableSQL
View File

@ -3,6 +3,6 @@ CREATE TABLE `user` (
`user` VARCHAR(50) NOT NULL DEFAULT '0',
`email` VARCHAR(100) NOT NULL DEFAULT '0',
`password` VARCHAR(100) NOT NULL DEFAULT '0',
PRIMARY KEY (`ID`),
PRIMARY KEY (`ID`)
UNIQUE INDEX `user` (`user`)
);
)