Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Loputöö #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Loemind.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# ProjectGPX (Mattias Blehner, Sten-Erik Tool, Eric Skripka);
*Veebileht, kus saab sisestada ja kuvada oma jooksutrajektoori ja v�rrelda oma tulemusi teistega.
*Sihtgrupiks on k�ik spordihuvilised/harrastajad.
*Sarnased lehed: endomundo.com ja sport-tracker.com jne.
3 changes: 0 additions & 3 deletions README.md

This file was deleted.

117 changes: 117 additions & 0 deletions class/Change.class.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<?php
class Change {
private $connection;

function __construct($mysqli){
//This viitab klassile(this == change)
$this->connection = $mysqli;
}


function changeUsername($changeUsername, $id) {
$stmt = $this->connection->prepare("UPDATE project_user SET username=? WHERE id=?");
echo $this->connection->error;
$stmt->bind_param("si",$changeUsername, $id);

//täida käsu
if($stmt->execute()) {
$answer = "Muutmine toimus edukalt";
$_SESSION['note'] = $answer;
} else {
$answer = "ERROR ".$stmt->error;
$_SESSION['note'] = $answer;
}
//panen ühenduse kinni
$stmt->close();
}

function changePassword($changePassword, $id) {
$stmt = $this->connection->prepare("UPDATE project_user SET password=? WHERE id=?");
echo $this->connection->error;
$stmt->bind_param("si",$changePassword, $id);

//täida käsu
if($stmt->execute()) {
$answer = "Muutmine toimus edukalt";
$_SESSION['note'] = $answer;
} else {
$answer = "ERROR ".$stmt->error;
$_SESSION['note'] = $answer;
}
//panen ühenduse kinni
$stmt->close();
}


function changeEmail($changeEmail, $id) {
$stmt = $this->connection->prepare("UPDATE project_user SET email=? WHERE id=?");
echo $this->connection->error;
$stmt->bind_param("si",$changeEmail, $id);

//täida käsu
if($stmt->execute()) {
$answer = "Muutmine toimus edukalt";
$_SESSION['note'] = $answer;
} else {
$answer = "ERROR ".$stmt->error;
$_SESSION['note'] = $answer;
}
//panen ühenduse kinni
$stmt->close();
}


function changeFirstName($changeFirstName, $id) {
$stmt = $this->connection->prepare("UPDATE project_user SET firstname=? WHERE id=?");
echo $this->connection->error;
$stmt->bind_param("si",$changeFirstName, $id);

//täida käsu
if($stmt->execute()) {
$answer = "Muutmine toimus edukalt";
$_SESSION['note'] = $answer;
} else {
$answer = "ERROR ".$stmt->error;
$_SESSION['note'] = $answer;
}
//panen ühenduse kinni
$stmt->close();
}

function changeLastName($changeLastName, $id) {
$stmt = $this->connection->prepare("UPDATE project_user SET lastname=? WHERE id=?");
echo $this->connection->error;
$stmt->bind_param("si",$changeLastName, $id);

//täida käsu
if($stmt->execute()) {
$answer = "Muutmine toimus edukalt";
$_SESSION['note'] = $answer;
} else {
$answer = "ERROR ".$stmt->error;
$_SESSION['note'] = $answer;
}
//panen ühenduse kinni
$stmt->close();
}


function changeGender($changeGender, $id) {
$stmt = $this->connection->prepare("UPDATE project_user SET gender=? WHERE id=?");
echo $this->connection->error;
$stmt->bind_param("si",$changeGender, $id);

//täida käsu
if($stmt->execute()) {
$answer = "Muutmine toimus edukalt";
$_SESSION['note'] = $answer;
} else {
$answer = "ERROR ".$stmt->error;
$_SESSION['note'] = $answer;
}
//panen ühenduse kinni
$stmt->close();
}

}
?>
14 changes: 14 additions & 0 deletions class/Helper.class.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php

class Helper {

function cleanInput($input){

$input = trim($input);
$input = stripslashes($input);
$input = htmlspecialchars($input);

return $input;
}
}
?>
98 changes: 98 additions & 0 deletions class/Interest.class.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?php
class Interest {

private $connection;

function __construct($mysqli){
$this->connection = $mysqli;
}

function get() {
$stmt = $this->connection->prepare("SELECT id, interest FROM project_intrests");
echo $this->connection->error;

$stmt->bind_result($id, $interest);
$stmt->execute();

//teen massiivi
$result = array();

// tee seda seni, kuni on rida andmeid mis vastab select lausele
while ($stmt->fetch()) {
//tekitan objekti
$i = new StdClass();
$i->id = $id;
$i->interest = $interest;
array_push($result, $i);
}
$stmt->close();
return $result;
}

function getUser() {

$stmt = $this->connection->prepare("SELECT interest FROM project_intrests JOIN project_user_interests ON project_intrests.id=project_user_interests.interest_id WHERE project_user_interests.user_id = ?");
echo $this->connection->error;
$stmt->bind_param("i", $_SESSION["userId"]);

$stmt->bind_result($interest);
$stmt->execute();

$result = array();

while ($stmt->fetch()) {
$i = new StdClass();
$i->interest = $interest;
array_push($result, $i);
}
$stmt->close();
return $result;
}

function save ($interest) {

$stmt = $this->connection->prepare("INSERT INTO project_intrests (interest) VALUES (?)");
echo $this->connection->error;
$stmt->bind_param("s", $interest);

if($stmt->execute()) {
$answer = "Salvestamine õnnestus.";
$_SESSION['note'] = $answer;
} else {
echo "ERROR ".$stmt->error;
}
$stmt->close();
}

function saveUser ($interest) {

$stmt = $this->connection->prepare("SELECT id FROM project_user_interests WHERE user_id=? AND interest_id=? ");
$stmt->bind_param("ii", $_SESSION["userId"], $interest);
$stmt->bind_result($id);
$stmt->execute();

if ($stmt->fetch()) {
// oli olemas juba selline rida
$answer2 = "Te juba tegelete selle hobiga.";
$_SESSION['note2'] = $answer2;
// pärast returni midagi edasi ei tehta funktsioonis
return;
}

$stmt->close();
// kui ei olnud siis sisestan
$stmt = $this->connection->prepare("
INSERT INTO project_user_interests (user_id, interest_id) VALUES (?, ?)");
echo $this->connection->error;
$stmt->bind_param("ii", $_SESSION["userId"], $interest);

if ($stmt->execute()) {
$answer2 = "Salvestamine õnnestus.";
$_SESSION['note2'] = $answer2;
} else {
echo "ERROR ".$stmt->error;
}
}
}

?>
65 changes: 65 additions & 0 deletions class/User.class.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
<?php
class User {
private $connection;

function __construct($mysqli){
//This viitab klassile(this == user)
$this->connection = $mysqli;
}
function signUp($signupUsername, $password, $signupEmail, $signupFirstName, $signupLastName, $signupGender) {
$stmt = $this->connection->prepare("INSERT INTO project_user (username, password, email, firstname, lastname, gender) VALUES (?, ?, ?, ?, ?, ?)");
echo $this->connection->error;
$stmt->bind_param("ssssss",$signupUsername, $password, $signupEmail, $signupFirstName, $signupLastName, $signupGender);

//täida käsu
if($stmt->execute()) {
echo "Salvestamine õnnestus";
header( "refresh:2; url=login.php" );
} else {
echo "ERROR ".$stmt->error;
}
//panen Ühenduse kinni
$stmt->close();
}

function login($loginEmail, $loginPassword) {

$error = "";
$password = $loginPassword;
$email = $loginEmail;

$stmt = $this->connection->prepare("SELECT id, username, password, email, firstname, lastname, gender FROM project_user WHERE email = ?");
echo $this->connection->error;

//asendan küsimärgi
$stmt->bind_param("s", $email);
//määrna väärtused muutujasse
$stmt->bind_result($id, $usernameFromDB, $passwordFromDB, $emailFromDB, $firstnameFromDB, $lastnameFromDB, $genderFromDB);
$stmt->execute();
//andmed tulid andmebaasist või mitte
//on tõene kui on vähemalt üks vastus

if($stmt->fetch()){
//oli sellise meiliga kasutaja
//password millega kasutaja tahab sisse logida
$hash = hash("sha512", $password);
if ($hash == $passwordFromDB) {
echo "Kasutaja logis sisse ".$id;
$_SESSION["userId"] = $id;
$_SESSION["userEmail"] = $emailFromDB;
$_SESSION["userName"] = $usernameFromDB;
$_SESSION["firstName"] = $firstnameFromDB;
$_SESSION["lastName"] = $lastnameFromDB;
$_SESSION["gender"] = $genderFromDB;
header("Location: data.php");
exit();
} else {
$error = "Vale parool või kasutajanimi";
}
//määran sessiooni muutujad
//header("Location: login.php");
}
return $error;
}
}
?>
58 changes: 58 additions & 0 deletions class/comment.class.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php
class comment {
private $connection;

function __construct($mysqli){

$this->connection = $mysqli;
}

function savecomment($userid, $fail, $comment) {
$stmt = $this->connection->prepare("INSERT INTO project_kommentaar (user_id, mapname, comment) VALUES (?, ?, ?)");
echo $this->connection->error;
$stmt->bind_param("iss",$userid, $fail, $comment);

if($stmt->execute()) {
echo "Salvestamine �nnestus";
} else {
echo "ERROR ".$stmt->error;
}
//panen �henduse kinni
$stmt->close();
}

function get($fail) {

$stmt = $this->connection->prepare("
SELECT username, comment FROM project_kommentaar JOIN project_user on project_user.id=project_kommentaar.user_id WHERE mapname=?");
$stmt->bind_param("s", $fail);
$stmt->bind_result($username, $comment);
$stmt->execute();
echo $this->connection->error;

//tekitan massiivi
$result = array();

// tee seda seni, kuni on rida andmeid
// mis vastab select lausele
while ($stmt->fetch()) {

//tekitan objekti
$somments = new StdClass();

$somments->username = $username;
$somments->comment = $comment;

// iga kord massiivi lisan juurde nr m�rgi
array_push($result, $somments);
}

$stmt->close();


return $result;
}


}
?>
16 changes: 16 additions & 0 deletions functions.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?php

require("../../../config.php");
//see vail peab olema kõigil lehtedel, kus tahan kasutada session muutujat

if(!isset($_SESSION)){
session_start();
}

$database = "if16_mattbleh_2";
$mysqli = new mysqli($serverHost, $serverUsername, $serverPassword, $database);

require("../class/Helper.class.php");
$Helper = new Helper();

?>
Loading