Trying to fix this monstrosity #1

This commit is contained in:
Domen Kajdič
2016-09-13 15:38:14 +02:00
parent 0e4b22d99f
commit 2cf2f3c343
22 changed files with 969 additions and 4733 deletions
+8 -7
View File
@@ -20,7 +20,7 @@ include("Session.php");
class Account {
function Account() {
function __construct() {
global $session;
if(isset($_POST['ft'])) {
switch($_POST['ft']) {
@@ -140,8 +140,8 @@ class Account {
{
global $database;
$q = "SELECT * FROM ".TB_PREFIX."activate where act = '".$_POST['id']."'";
$result = mysql_query($q, $database->connection);
$dbarray = mysql_fetch_array($result);
$result = mysqli_query($q, $database->connection);
$dbarray = mysqli_fetch_array($result);
if($dbarray['act'] == $_POST['id']) {
$uid = $database->register($dbarray['username'],$dbarray['password'],$dbarray['email'],$dbarray['tribe'],"");
if($uid) {
@@ -165,8 +165,8 @@ class Account {
private function Unreg() {
global $database;
$q = "SELECT * FROM ".TB_PREFIX."activate where id = '".$_POST['id']."'";
$result = mysql_query($q, $database->connection);
$dbarray = mysql_fetch_array($result);
$result = mysqli_query($database->connection,$q);
$dbarray = mysqli_fetch_array($result);
if(md5($_POST['pw']) == $dbarray['password']) {
$database->unreg($dbarray['username']);
header("Location: anmelden.php");
@@ -178,9 +178,10 @@ class Account {
private function Login() {
global $database,$session,$form;
$_POST['user'] = mysql_real_escape_string($_POST['user']);
$user = $_POST['user'];
$user = mysqli_real_escape_string($link, $user);
if(!isset($_POST['user']) || $_POST['user'] == "") {
$form->addError("user",LOGIN_USR_EMPTY);
$form->addError("user",$user);
}
else if(!$database->checkExist($_POST['user'],0)) {
$form->addError("user",USR_NT_FOUND);