Unifies all posts on a single table

boards.php

@@ -15,17 +15,19 @@
 $total_posts = 0;
 
 foreach ($boards as $i => $board) {
-
-	//$query = prepare(sprintf("SELECT (SELECT MAX(id) from ``posts_%s``) AS max, (SELECT MAX(id) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) < DATE_SUB(NOW(), INTERVAL 1 HOUR)) AS oldmax, (SELECT MAX(id) from ``posts_%s``) AS max_d, (SELECT MAX(id) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) < DATE_SUB(NOW(), INTERVAL 1 DAY)) AS oldmax_d, (SELECT count(id) FROM ``posts_%s``) AS count;", $board['uri'], $board['uri'], $board['uri'], $board['uri'], $board['uri']));
-
-	$query = prepare(sprintf("
-SELECT MAX(id) max, (SELECT COUNT(*) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 1 DAY)) ppd, 
-(SELECT COUNT(*) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 1 HOUR)) pph,
-(SELECT count(id) FROM ``posts_%s``) count,
-(SELECT COUNT(DISTINCT ip) FROM ``posts_%s`` WHERE FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 3 DAY)) uniq_ip
- FROM ``posts_%s``
-", $board['uri'], $board['uri'], $board['uri'], $board['uri'], $board['uri']));
+	$query = prepare("
+	SELECT
+	  (SELECT coalesce((SELECT max(`id`) FROM ``posts`` WHERE `board` = :board),0)) max,
+		(SELECT COUNT(*) FROM ``posts`` WHERE `board` = :board AND FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 1 DAY)) ppd,
+		(SELECT COUNT(*) FROM ``posts`` WHERE `board` = :board AND FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 1 HOUR)) pph,
+		(SELECT count(id) FROM ``posts`` WHERE `board` = :board) count,
+    (SELECT COUNT(DISTINCT ip) FROM ``posts`` WHERE `board` = :board AND FROM_UNIXTIME(time) > DATE_SUB(NOW(), INTERVAL 3 DAY)) uniq_ip
+	FROM ``posts``
+	WHERE `board` = :board");
+	$query->bindValue(':board', $board['uri']);
+  $pdo->beginTransaction();
 	$query->execute() or error(db_error($query));
+  $pdo->commit();
 	$r = $query->fetch(PDO::FETCH_ASSOC);
 
 	$pph = $r['pph'];

create.php

@@ -111,9 +111,6 @@
 $query->bindValue(':subtitle', $_POST['subtitle']);
 $query->execute() or error(db_error($query));
 
-$query = Element('posts.sql', array('board' => $uri));
-query($query) or error(db_error());
-
 if (!openBoard($_POST['uri']))
 	error(_("Couldn't open board after creation."));
 if ($config['cache']['enabled'])

expire.php

@@ -19,12 +19,14 @@
 	}
 
 	// last post
-	$query = prepare(sprintf("SELECT MAX(time) AS time FROM posts_%s", $board));
+	$query = prepare("SELECT MAX(time) AS time FROM posts WHERE `board` = :board");
+	$query->bindValue(':board', $board);
 	$query->execute();
 	$row = $query->fetch();
 
 	//count posts
-	$query = prepare(sprintf("SELECT COUNT(id) AS count FROM posts_%s", $board));
+	$query = prepare("SELECT COUNT(id) AS count FROM posts WHERE `board` = :board", $board);
+	$query->bindValue(':board', $board);
 	$query->execute();
 	$count = $query->fetch();
 
@@ -79,8 +81,10 @@
 		cache::delete('all_boards');
 	}
 
-	// Delete posting table
-	$query = query(sprintf('DROP TABLE IF EXISTS ``posts_%s``', $board['uri'])) or error(db_error());
+	// Delete posts
+  $query = prepare('DELETE FROM ``posts`` WHERE `board` = :board');
+  $query->bindValue(':board', $board['uri']);
+  $query->execute() or error(db_error($query));
 
 	// Clear reports
 	$query = prepare('DELETE FROM ``reports`` WHERE `board` = :id');

inc/instance-config.php

@@ -353,7 +353,9 @@ function purify($s){
 			openBoard($b);
 			buildIndex();
 			buildJavascript();
-			$query = query(sprintf("SELECT `id` FROM ``posts_%s`` WHERE `thread` IS NULL", $b)) or error(db_error());
+			$query = prepare("SELECT `id` FROM ``posts`` WHERE `board` = :board AND `thread` IS NULL");
+			$query->bindValue(':board', $b);
+			$query->execute() or error(db_error());
 			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				buildThread($post['id']);
 			}