1
0
mirror of https://github.com/Foltik/Shimapan synced 2024-11-30 22:41:47 -05:00

Fix random bugs

This commit is contained in:
Foltik 2016-08-14 22:51:26 -04:00
parent 3e334aec23
commit cf4b4418f6

View File

@ -77,13 +77,6 @@ function uploadFile($file)
} }
} }
if ($file->size > {{max_upload_size}} * 1048576) {
throw new Exception(
'File too large',
500
);
}
// Check if a file with the same hash and size (a file which is the same) // Check if a file with the same hash and size (a file which is the same)
// does already exist in the database; if it does, return the proper link // does already exist in the database; if it does, return the proper link
@ -94,7 +87,7 @@ function uploadFile($file)
$q->bindValue(':size', $file->size); $q->bindValue(':size', $file->size);
$q->execute(); $q->execute();
$result = $q->fetch(); $result = $q->fetch();
if ($result['count'] > 0) {024024024 if ($result['count'] > 0) {
return array( return array(
'hash' => $file->getSha1(), 'hash' => $file->getSha1(),
'name' => $file->name, 'name' => $file->name,
@ -132,7 +125,7 @@ function uploadFile($file)
$q->bindValue(':apikey', $_POST['apikey']); $q->bindValue(':apikey', $_POST['apikey']);
$q->execute(); $q->execute();
$result = $q->fetch(); $result = $q->fetch();
$user = result['user']; $user = $result['user'];
$q = $db->prepare('INSERT INTO files (hash, originalname, filename, size, date, ' . $q = $db->prepare('INSERT INTO files (hash, originalname, filename, size, date, ' .
'expire, delid, user) VALUES (:hash, :orig, :name, :size, :date, ' . 'expire, delid, user) VALUES (:hash, :orig, :name, :size, :date, ' .
':exp, :del, :user)'); if (!isset($_POST['apikey']) && isset($_SESSION['user'])) { ':exp, :del, :user)'); if (!isset($_POST['apikey']) && isset($_SESSION['user'])) {
@ -202,7 +195,7 @@ $type = isset($_GET['output']) ? $_GET['output'] : 'json';
$response = new Response($type); $response = new Response($type);
if (isset($_FILES['files'])) { if (isset($_FILES['files'])) {
if (isset($_POST['apikey]) || isset($_SESSION['id'])) { if (isset($_POST['apikey']) || isset($_SESSION['id'])) {
if (isset($_POST['apikey'])) { if (isset($_POST['apikey'])) {
$q = $db->prepare('SELECT user FROM accounts WHERE apikey = (:apikey)'); $q = $db->prepare('SELECT user FROM accounts WHERE apikey = (:apikey)');
$q->bindValue(':apikey', $_POST['apikey']); $q->bindValue(':apikey', $_POST['apikey']);