Merge branch 'master' of https://github.com/ctrlcctrlv/Tinyboard

1 files changed, 28 insertions, 17 deletions

diff --git a/inc/functions.php b/inc/functions.php
index a75ebb8a..8de88ecf 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -959,6 +959,7 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 			// Delete thread HTML page
 			file_unlink($board['dir'] . $config['dir']['res'] . sprintf($config['file_page'], $post['id']));
 			file_unlink($board['dir'] . $config['dir']['res'] . sprintf($config['file_page50'], $post['id']));
+			file_unlink($board['dir'] . $config['dir']['res'] . sprintf('%d.json', $post['id']));
 
 			$antispam_query = prepare('DELETE FROM ``antispam`` WHERE `board` = :board AND `thread` = :thread');
 			$antispam_query->bindValue(':board', $board['uri']);
@@ -1299,8 +1300,10 @@ function buildIndex() {
 	if (!$config['try_smarter'])
 		$antibot = create_antibot($board['uri']);
 
-	$api = new Api();
-	$catalog = array();
+	if ($config['api']['enabled']) {
+		$api = new Api();
+		$catalog = array();
+	}
 
 	for ($page = 1; $page <= $config['max_pages']; $page++) {
 		$filename = $board['dir'] . ($page == 1 ? $config['file_index'] : sprintf($config['file_page'], $page));
@@ -1324,27 +1327,33 @@ function buildIndex() {
 		file_write($filename, Element('index.html', $content));
 
 		// json api
-		$threads = $content['threads'];
-		$json = json_encode($api->translatePage($threads));
-		$jsonFilename = $board['dir'] . ($page-1) . ".json"; // pages should start from 0
-		file_write($jsonFilename, $json);
+		if ($config['api']['enabled']) {
+			$threads = $content['threads'];
+			$json = json_encode($api->translatePage($threads));
+			$jsonFilename = $board['dir'] . ($page-1) . ".json"; // pages should start from 0
+			file_write($jsonFilename, $json);
 
-		$catalog[$page-1] = $threads; 
+			$catalog[$page-1] = $threads; 
+		}
 	}
 	if ($page < $config['max_pages']) {
 		for (;$page<=$config['max_pages'];$page++) {
 			$filename = $board['dir'] . ($page==1 ? $config['file_index'] : sprintf($config['file_page'], $page));
 			file_unlink($filename);
-
-			$jsonFilename = $board['dir'] . ($page-1) . ".json";
-			file_unlink($jsonFilename);
+			
+			if ($config['api']['enabled']) {
+				$jsonFilename = $board['dir'] . ($page-1) . ".json";
+				file_unlink($jsonFilename);
+			}
 		}
 	}
 
 	// json api catalog
-	$json = json_encode($api->translateCatalog($catalog));
-	$jsonFilename = $board['dir'] . "catalog.json";
-	file_write($jsonFilename, $json);
+	if ($config['api']['enabled']) {
+		$json = json_encode($api->translateCatalog($catalog));
+		$jsonFilename = $board['dir'] . "catalog.json";
+		file_write($jsonFilename, $json);
+	}
 }
 
 function buildJavascript() {
@@ -1765,10 +1774,12 @@ function buildThread($id, $return = false, $mod = false) {
 		$build_pages[] = thread_find_page($id);
 
 	// json api
-	$api = new Api();
-	$json = json_encode($api->translateThread($thread));
-	$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . ".json";
-	file_write($jsonFilename, $json);
+	if ($config['api']['enabled']) {
+		$api = new Api();
+		$json = json_encode($api->translateThread($thread));
+		$jsonFilename = $board['dir'] . $config['dir']['res'] . $id . ".json";
+		file_write($jsonFilename, $json);
+	}
 
 	if ($return) {
 		return $body;