uni-days/ittech
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed W12

Browse source
This commit is contained in:
Andrew 2023-03-26 16:58:46 +07:00
parent ee0715c3b2
commit 8680f03b91
19 changed files with 444 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

28
w12/index.php
View file

@ -53,7 +53,7 @@ SimpleRouter::post('/register', function() {
// if login or password is empty, redirect to register page with error
if (empty($login) || empty($password)) {
return response()->redirect('/register?error=Empty login or password given!');
return response()->redirect('/register?error=Проверьте данные формы!');
}
// try create user if ok - redirect to login page with message
@ -61,9 +61,9 @@ SimpleRouter::post('/register', function() {
Database::createUser($login, $password);
$user = Database::getUser($login);
Database::createEmptyMenuForUser($user);
response()->redirect('/login?message=User created');
response()->redirect('/login?message=Пользователь создан');
} catch (PDOException $e) {
response()->redirect('/register?error=User already exists!');
response()->redirect('/register?error=Пользователь уже существует!');
}
});
@ -89,13 +89,13 @@ SimpleRouter::post('/login', function() {
// if login or password is empty, redirect to register page with error
if (empty($login) || empty($password)) {
return response()->redirect('/login?error=Empty login or password given!');
return response()->redirect('/login?error=Проверьте данные формы!');
}
if (!Database::userExists($login)) {
return response()->redirect('/login?error=User does not exist!');
return response()->redirect('/login?error=Пользователь не существует!');
}
if (!Database::verifyUser($login, $password)) {
return response()->redirect('/login?error=Wrong password!');
return response()->redirect('/login?error=Неправильный пароль!');
}
$user = Database::getUser($login);
@ -223,8 +223,9 @@ SimpleRouter::post('/uploadImage', function() {
$source = imagecreatefromjpeg($fullpath);
imagecopyresized($thumb, $source, 0, 0, 0, 0, $width, $height, $size[0], $size[1]);
$color = imagecolorallocate($thumb, 255, 0, 0);
imagestring($thumb, 2, 2, 2, "Watermark text :)", $color);
$color = imagecolorallocate($thumb, 0, 255, 0);
$ulogin = getSessionVariable('user')['login'];
imagestring($thumb, 2, 2, 2, "$ulogin @ LABA", $color);
imagejpeg($thumb, 'data/thumb/' . $filename);
try {
@ -290,7 +291,6 @@ SimpleRouter::post('/image/{id}', function($id) {
$description = input()->post('description', '')->value;
$published = boolval(input()->post('published', 0)->value)?"true":"false";
var_dump($published);
try {
Database::updateImage($id, $description, $published);
} catch (PDOException $e) {
@ -366,12 +366,12 @@ SimpleRouter::post('/import', function() {
if ($xml) {
try {
list($ok, $fail) = Database::importUsersXML($xml);
response()->redirect("/import?message=OK: $ok, FAIL: $fail");
response()->redirect("/import?message=OK: $ok, КРАХ: $fail");
} catch (Exception $e) {
response()->redirect("/import?error=" . $e->getMessage());
}
} else {
response()->redirect('/import?error=Error happened ');
response()->redirect('/import?error=Произошла ошибка');
}
});
@ -421,15 +421,15 @@ SimpleRouter::post('/recover-password', function() use ($twig) {
'login' => $login,
'password' => $newPassword,
]);
response()->redirect('/recover-password?message=Success! We sent you an email with your new password&mail=' . urlencode($sentMail));
response()->redirect('/recover-password?message=Сообщение с паролем отправлено&mail=' . urlencode($sentMail));
} else {
response()->redirect('/recover-password?error=User not found');
response()->redirect('/recover-password?error=Пользователь не найден!');
}
} catch (PDOException $e) {
response()->redirect('/recover-password?error=' . $e->getMessage());
}
} else {
response()->redirect('/recover-password?error=Error happened');
response()->redirect('/recover-password?error=Произошла ошибка');
}
});