summaryrefslogtreecommitdiff
path: root/inc/functions.php
diff options
context:
space:
mode:
authorSavetheinternet <savetheinternet@n0v4.com>2011-02-11 23:02:30 +1100
committerSavetheinternet <savetheinternet@n0v4.com>2011-02-11 23:02:30 +1100
commitc34ea2e3af01d9a688fb14b3da550aa96615f312 (patch)
tree8560552c1f92ce13452cca79172799491ff9b69a /inc/functions.php
parent0346862645aa0b9a8ba0f0d929b336b08ff8fcf4 (diff)
a Fixed delete by IP, plus a bunch of small stuff
Diffstat (limited to 'inc/functions.php')
-rw-r--r--inc/functions.php12
1 files changed, 8 insertions, 4 deletions
diff --git a/inc/functions.php b/inc/functions.php
index c9b85ad4..6901de62 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -299,7 +299,7 @@
}
// Delete a post (reply or thread)
- function deletePost($id) {
+ function deletePost($id, $error_if_doesnt_exist=true) {
global $board;
// Select post and replies (if thread) in one query
@@ -308,7 +308,9 @@
$query->execute() or error(db_error($query));
if($query->rowCount() < 1) {
- error(ERROR_INVALIDPOST);
+ if($error_if_doesnt_exist)
+ error(ERROR_INVALIDPOST);
+ else return false;
}
// Delete posts and maybe replies
@@ -337,6 +339,8 @@
if(isset($rebuild)) {
buildThread($rebuild);
}
+
+ return true;
}
function clean() {
@@ -370,7 +374,7 @@
while($th = $query->fetch()) {
$thread = new Thread($th['id'], $th['subject'], $th['email'], $th['name'], $th['trip'], $th['body'], $th['time'], $th['thumb'], $th['thumbwidth'], $th['thumbheight'], $th['file'], $th['filewidth'], $th['fileheight'], $th['filesize'], $th['filename'], $th['ip'], $th['sticky'], $th['locked'], $mod ? '?/' : ROOT, $mod);
- $posts = prepare(sprintf("SELECT `id`, `subject`, `email`, `name`, `trip`, `body`, `time`, `thumb`, `thumbwidth`, `thumbheight`, `file`, `filewidth`, `fileheight`, `filesize`, `filename`,`ip` FROM `posts_%s` WHERE `thread` = ? ORDER BY `time` DESC LIMIT ?", $board['uri']));
+ $posts = prepare(sprintf("SELECT `id`, `subject`, `email`, `name`, `trip`, `body`, `time`, `thumb`, `thumbwidth`, `thumbheight`, `file`, `filewidth`, `fileheight`, `filesize`, `filename`,`ip` FROM `posts_%s` WHERE `thread` = ? ORDER BY `id` DESC LIMIT ?", $board['uri']));
$posts->bindValue(1, $th['id']);
$posts->bindValue(2, THREADS_PREVIEW, PDO::PARAM_INT);
$posts->execute() or error(db_error($posts));
@@ -859,7 +863,7 @@
switch($type) {
case 'jpg':
case 'jpeg':
- if(!$image = imagecreatefromjpeg($source_pic)) {
+ if(!$image = @imagecreatefromjpeg($source_pic)) {
unlink($source_pic);
error(ERR_INVALIDIMG);
}