multiimage posting

3 files changed, 14 insertions, 7 deletions

diff --git a/templates/themes/catalog/theme.php b/templates/themes/catalog/theme.php
index d3a837ca..1f42b8d1 100644
--- a/templates/themes/catalog/theme.php
+++ b/templates/themes/catalog/theme.php
@@ -40,7 +40,10 @@
 			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id']));
 				$post['board_name'] = $board['name'];
-				$post['file'] = $config['uri_thumb'] . $post['thumb'];
+				if (isset($post['files']))
+					$files = json_decode($post['files']);
+                    if ($files[0]->file == 'deleted') continue;
+					$post['file'] = $config['uri_thumb'] . $files[0]->thumb;
 				$recent_posts[] = $post;
 			}
 			
diff --git a/templates/themes/recent/theme.php b/templates/themes/recent/theme.php
index 26a9a69b..842ab9ac 100644
--- a/templates/themes/recent/theme.php
+++ b/templates/themes/recent/theme.php
@@ -42,7 +42,7 @@
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
-				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `file` != 'deleted' AND `thumb` != 'spoiler' UNION ALL ", $_board['uri'], $_board['uri']);
+				$query .= sprintf("SELECT *, '%s' AS `board` FROM ``posts_%s`` WHERE `files` IS NOT NULL UNION ALL ", $_board['uri'], $_board['uri']);
 			}
 			$query = preg_replace('/UNION ALL $/', 'ORDER BY `time` DESC LIMIT ' . (int)$settings['limit_images'], $query);
 			
@@ -54,10 +54,14 @@
 			
 			while ($post = $query->fetch(PDO::FETCH_ASSOC)) {
 				openBoard($post['board']);
+				if (isset($post['files']))
+					$files = json_decode($post['files']);
+
+                if ($files[0]->file == 'deleted') continue;
 				
 				// board settings won't be available in the template file, so generate links now
 				$post['link'] = $config['root'] . $board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], ($post['thread'] ? $post['thread'] : $post['id'])) . '#' . $post['id'];
-				$post['src'] = $config['uri_thumb'] . $post['thumb'];
+				if ($files) $post['src'] = $config['uri_thumb'] . $files[0]->thumb;
 				
 				$recent_images[] = $post;
 			}
@@ -105,7 +109,7 @@
 			$stats['unique_posters'] = number_format($query->fetchColumn());
 			
 			// Active content
-			$query = 'SELECT SUM(`filesize`) FROM (';
+			/*$query = 'SELECT SUM(`filesize`) FROM (';
 			foreach ($boards as &$_board) {
 				if (in_array($_board['uri'], $this->excluded))
 					continue;
@@ -113,7 +117,7 @@
 			}
 			$query = preg_replace('/UNION ALL $/', ') AS `posts_all`', $query);
 			$query = query($query) or error(db_error());
-			$stats['active_content'] = $query->fetchColumn();
+			$stats['active_content'] = $query->fetchColumn();*/
 			
 			return Element('themes/recent/recent.html', Array(
 				'settings' => $settings,
diff --git a/templates/themes/ukko/theme.php b/templates/themes/ukko/theme.php
index 1ca00014..88b0c4a4 100644
--- a/templates/themes/ukko/theme.php
+++ b/templates/themes/ukko/theme.php
@@ -51,14 +51,14 @@
 					
 					$num_images = 0;
 					while ($po = $posts->fetch()) {
-						if ($po['file'])
+						if ($po['files'])
 							$num_images++;
 						
 						$thread->add(new Post($po, $mod ? '?/' : $config['root'], $mod));
 					
 					}
 					if ($posts->rowCount() == ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview'])) {
-						$ct = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM ``posts_%s`` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM ``posts_%s`` WHERE `file` IS NOT NULL AND `thread` = :thread", $post['board'], $post['board']));
+						$ct = prepare(sprintf("SELECT COUNT(`id`) as `num` FROM ``posts_%s`` WHERE `thread` = :thread UNION ALL SELECT COUNT(`id`) FROM ``posts_%s`` WHERE `files` IS NOT NULL AND `thread` = :thread", $post['board'], $post['board']));
 						$ct->bindValue(':thread', $post['id'], PDO::PARAM_INT);
 						$ct->execute() or error(db_error($count));