From bd87661a69034f63fe2735389357db5cbaa26656 Mon Sep 17 00:00:00 2001
From: Dedushka <dedushka1@protonmail.com>
Date: Mon, 18 Jan 2021 23:26:53 -0500
Subject: [PATCH 01/10] Add PPH and unique posters stats to home page

---
 templates/themes/categories/news.html | 16 +++++--
 templates/themes/categories/theme.php | 60 +++++++++++++++++++++------
 2 files changed, 60 insertions(+), 16 deletions(-)

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 7469f10c..48dcf300 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -24,11 +24,21 @@
 			{% endfor %}
 		{% endif %}
 	</div>
-		
+
+        <div class="ban">
+          <h2 id="post-statistics">
+            {% trans "Post Statistics" %}
+          </h2>
+          <p>
+            {% stats.pph %} {% trans "posts in the last hour." %}
+            {% stats.unique_ip_count %} {% trans "unique posters in the last hour." %}
+          </p>
+        </div>
+
 	<footer>
-	        <p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard + 
+	        <p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard +
 	                <a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
-	        <br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group    
+	        <br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group
 	        <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
 		<br><br>
 		<br><b>Leftypol.org is not currently under investigation by any Federal, State, or Local Authorities.</b></p>
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 650f4e6c..d72762b9 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -1,12 +1,12 @@
 <?php
 	require 'info.php';
-	
+
 	function categories_build($action, $settings, $board) {
 		// Possible values for $action:
 		//	- all (rebuild everything, initialization)
 		//	- news (news has been updated)
 		//	- boards (board list changed)
-		
+
 		Categories::build($action, $settings);
 	}
 
@@ -14,22 +14,23 @@
 	class Categories {
 		public static function build($action, $settings) {
 			global $config;
-			
+
 			if ($action == 'all')
 				file_write($config['dir']['home'] . $settings['file_main'], Categories::homepage($settings));
-			
+
 			if ($action == 'all' || $action == 'boards')
 				file_write($config['dir']['home'] . $settings['file_sidebar'], Categories::sidebar($settings));
-			
+
 			if ($action == 'all' || $action == 'news')
 				file_write($config['dir']['home'] . $settings['file_news'], Categories::news($settings));
 		}
-		
+
 		// Build homepage
 		public static function homepage($settings) {
 			global $config;
 			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
+            $stats = Categories::getPostStatistics($settings);
 			return Element(
 				'themes/categories/frames.html',
 				Array(
@@ -37,19 +38,20 @@
 					'settings' => $settings,
 					'categories' => Categories::getCategories($config),
 					'news' => $news,
+                    'stats' => $stats,
 					'boardlist' => createBoardlist(false)
 
 				)
 			);
 		}
-		
+
 		// Build news page
 		public static function news($settings) {
 			global $config;
-			
+
 			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
-			
+
 			return Element('themes/categories/news.html', Array(
 				'settings' => $settings,
 				'config' => $config,
@@ -57,11 +59,11 @@
 				'boardlist' => createBoardlist(false)
 			));
 		}
-		
+
 		// Build sidebar
 		public static function sidebar($settings) {
 			global $config, $board;
-			
+
 			return Element('themes/categories/sidebar.html', Array(
 				'settings' => $settings,
 				'config' => $config,
@@ -71,7 +73,7 @@
 
 		private static function getCategories($config) {
 			$categories = $config['categories'];
-			
+
 			foreach ($categories as &$boards) {
 				foreach ($boards as &$board) {
 					$title = boardTitle($board);
@@ -83,6 +85,38 @@
 
 			return $categories;
 		}
+
+        private static function getPostStatistics($settings) {
+            $boards = query("SELECT uri FROM ``boards``");
+            $unique = Array();
+            $pph = 0;
+
+            foreach ($boards->fetchAll() as $_board) {
+                $pph_query = query(
+                    sprintf("SELECT COUNT(*) AS count FROM ``posts_%s`` WHERE time > %d",
+                            $_board['uri'],
+                            time()-3600)
+                ) or error(db_error());
+
+                $pph += $pph_query->fetch()['count'];
+
+                $unique_query = query(
+                    sprintf("SELECT ip FROM ``posts_%s`` WHERE time > %d",
+                            $_board['uri'],
+                            time()-3600)
+                ) or error(db_error());
+
+                foreach ($unique_query->fetchAll() as $_k => $row) {
+                    $unique[$row['ip']] = true;
+                }
+            }
+
+            $unique_ip_count = count($unique);
+
+            return Array('pph' => $pph, 'unique_ip_count' => $unique_ip_count);
+        }
+
+
 	};
-	
+
 ?>

From bdf1fcf27b7b79719963b4332447e897265cb84d Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 18:40:53 -0600
Subject: [PATCH 02/10] Fixes bug and updates PPH on each post

---
 templates/themes/categories/news.html |  4 ++--
 templates/themes/categories/theme.php | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 48dcf300..8f96de7f 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -30,8 +30,8 @@
             {% trans "Post Statistics" %}
           </h2>
           <p>
-            {% stats.pph %} {% trans "posts in the last hour." %}
-            {% stats.unique_ip_count %} {% trans "unique posters in the last hour." %}
+            {{ stats.pph }} {% trans "posts in the last hour." %}
+            {{ stats.unique_ip_count }} {% trans "unique posters in the last hour." %}
           </p>
         </div>
 
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index d72762b9..4877f88b 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -14,23 +14,29 @@
 	class Categories {
 		public static function build($action, $settings) {
 			global $config;
-
-			if ($action == 'all')
+			
+			if ($action == 'all' ||
+				$action == 'boards' ||
+				$action == 'news' ||
+				$action == 'post' ||
+				$action == 'post-thread' ||
+	 			$action == 'post-delete'){
 				file_write($config['dir']['home'] . $settings['file_main'], Categories::homepage($settings));
-
-			if ($action == 'all' || $action == 'boards')
-				file_write($config['dir']['home'] . $settings['file_sidebar'], Categories::sidebar($settings));
-
-			if ($action == 'all' || $action == 'news')
 				file_write($config['dir']['home'] . $settings['file_news'], Categories::news($settings));
+			}
+			
+			if ($action == 'all'){
+				file_write($config['dir']['home'] . $settings['file_sidebar'], Categories::sidebar($settings));
+			}
 		}
 
+
 		// Build homepage
 		public static function homepage($settings) {
 			global $config;
 			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
-            $stats = Categories::getPostStatistics($settings);
+			$stats = Categories::getPostStatistics($settings);
 			return Element(
 				'themes/categories/frames.html',
 				Array(
@@ -38,7 +44,7 @@
 					'settings' => $settings,
 					'categories' => Categories::getCategories($config),
 					'news' => $news,
-                    'stats' => $stats,
+					'stats' => $stats,
 					'boardlist' => createBoardlist(false)
 
 				)
@@ -51,11 +57,12 @@
 
 			$query = query("SELECT * FROM ``news`` ORDER BY `time` DESC") or error(db_error());
 			$news = $query->fetchAll(PDO::FETCH_ASSOC);
-
+			$stats = Categories::getPostStatistics($settings);
 			return Element('themes/categories/news.html', Array(
 				'settings' => $settings,
 				'config' => $config,
 				'news' => $news,
+				'stats' => $stats,
 				'boardlist' => createBoardlist(false)
 			));
 		}

From c438ff9ab01b3194ad63ad6002840c6d02db46d7 Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 20:27:00 -0600
Subject: [PATCH 03/10] Per board pph

---
 templates/themes/categories/news.html | 59 ++++++++++++++++++++-------
 templates/themes/categories/theme.php | 36 +++++++++++-----
 2 files changed, 70 insertions(+), 25 deletions(-)

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 8f96de7f..54797185 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -24,22 +24,51 @@
 			{% endfor %}
 		{% endif %}
 	</div>
-
-        <div class="ban">
-          <h2 id="post-statistics">
-            {% trans "Post Statistics" %}
-          </h2>
-          <p>
-            {{ stats.pph }} {% trans "posts in the last hour." %}
-            {{ stats.unique_ip_count }} {% trans "unique posters in the last hour." %}
-          </p>
-        </div>
-
+		{% if stats %}
+			<div class="ban post">
+				<h2 id="post-statistics">
+				{% trans "Post Statistics" %}
+				</h2>
+				<table class="modlog" style="width: 50%; text-align: left;">
+					<thead>
+						<tr>
+							<th>Board</th>
+							<th>PPH</th>
+							<th>Recent IPs</th>
+						</tr>
+						</thead>
+					<tbody>
+						<tr>
+							<td class="minimal">
+								<span>{% trans Total %}</span>
+							</td>
+							<td class="minimal">
+								<span>{{ stats.pph }}</span>
+							</td>
+							<td class="minimal">
+								<span>{{ stats.recent_ips }}</span>
+							</td>
+						</tr>
+						{% for boardStat in stats.boards %}
+							<tr>
+								<td class="minimal">
+									<span>{{ boardStat.title }}</span>
+								</td>
+								<td class="minimal">
+									<span>{{ boardStat.pph }}</span>
+								</td class="minimal">
+									<span>{{ boardStat.recent_ips }}</span>
+								</td>
+							</tr>
+				</tbody>
+				</table>
+			</div>
+		{% endif %}
 	<footer>
-	        <p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard +
-	                <a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
-	        <br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group
-	        <br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
+			<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard +
+					<a href="https://engine.vichan.net/">vichan</a> {{ config.version }} -
+			<br>Tinyboard Copyright &copy; 2010-2014 Tinyboard Development Group
+			<br><a href="https://engine.vichan.net/">vichan</a> Copyright &copy; 2012-2016 vichan-devel
 		<br><br>
 		<br><b>Leftypol.org is not currently under investigation by any Federal, State, or Local Authorities.</b></p>
 	</footer>
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 4877f88b..9806421f 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -24,7 +24,7 @@
 				file_write($config['dir']['home'] . $settings['file_main'], Categories::homepage($settings));
 				file_write($config['dir']['home'] . $settings['file_news'], Categories::news($settings));
 			}
-			
+
 			if ($action == 'all'){
 				file_write($config['dir']['home'] . $settings['file_sidebar'], Categories::sidebar($settings));
 			}
@@ -94,33 +94,49 @@
 		}
 
         private static function getPostStatistics($settings) {
-            $boards = query("SELECT uri FROM ``boards``");
-            $unique = Array();
-            $pph = 0;
+        	if (!isset($config['boards'])) {
+        		return null;
+        	}
+
+        	$stats = [];
+
+            foreach (array_merge(... $config['boards']) as $_board) {
+            	$title = boardTitle($board);
+            	if (!$title) {
+            		// board doesn't exist. 
+            		continue;
+            	}
+
+            	$boardStat['title'] = $title;
 
-            foreach ($boards->fetchAll() as $_board) {
                 $pph_query = query(
                     sprintf("SELECT COUNT(*) AS count FROM ``posts_%s`` WHERE time > %d",
                             $_board['uri'],
                             time()-3600)
                 ) or error(db_error());
 
-                $pph += $pph_query->fetch()['count'];
+                $boardStat['pph'] = $pph_query->fetch()['count'];
 
                 $unique_query = query(
-                    sprintf("SELECT ip FROM ``posts_%s`` WHERE time > %d",
+                    sprintf("SELECT DISTINCT ip FROM ``posts_%s`` WHERE time > %d",
                             $_board['uri'],
                             time()-3600)
                 ) or error(db_error());
 
-                foreach ($unique_query->fetchAll() as $_k => $row) {
+                $unique_ips = $unique_query->fetchAll();
+                $boardStat['recent_ips'] = count($unique_ips);
+
+                foreach ( as $_k => $row) {
                     $unique[$row['ip']] = true;
                 }
+
+                $stats['boards'][] = $boardStat;
             }
 
-            $unique_ip_count = count($unique);
+            $stats['recent_ips'] = count($unique);
+            $stats['pph'] = count(array_column($stats['board'], 'pph'));
 
-            return Array('pph' => $pph, 'unique_ip_count' => $unique_ip_count);
+            return $stats;
         }
 
 

From ed2fd963e518bc57beeba2ae4c7ccfb931d3948f Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 20:38:18 -0600
Subject: [PATCH 04/10] Syntax errors

---
 templates/themes/categories/news.html | 1 +
 templates/themes/categories/theme.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 54797185..1c6de4bd 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -60,6 +60,7 @@
 									<span>{{ boardStat.recent_ips }}</span>
 								</td>
 							</tr>
+						{% endfor %}
 				</tbody>
 				</table>
 			</div>
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 9806421f..4d2fbeb8 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -126,7 +126,7 @@
                 $unique_ips = $unique_query->fetchAll();
                 $boardStat['recent_ips'] = count($unique_ips);
 
-                foreach ( as $_k => $row) {
+                foreach ($unique_ips as $_k => $row) {
                     $unique[$row['ip']] = true;
                 }
 

From 36cf6f4174ec0c2e546fe841d64edff309acf7af Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 20:49:15 -0600
Subject: [PATCH 05/10] bugs

---
 templates/themes/categories/theme.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 4d2fbeb8..5b84095c 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -94,20 +94,22 @@
 		}
 
         private static function getPostStatistics($settings) {
+        	global $config;
+
         	if (!isset($config['boards'])) {
         		return null;
         	}
 
         	$stats = [];
 
-            foreach (array_merge(... $config['boards']) as $_board) {
-            	$title = boardTitle($board);
-            	if (!$title) {
+            foreach (array_merge(... $config['boards']) as $uri) {
+            	$_board = getBoardInfo($uri);
+            	if (!$_board) {
             		// board doesn't exist. 
             		continue;
             	}
 
-            	$boardStat['title'] = $title;
+            	$boardStat['title'] = $_board['title'];
 
                 $pph_query = query(
                     sprintf("SELECT COUNT(*) AS count FROM ``posts_%s`` WHERE time > %d",

From 662e4889437b8096d75c51527b425a83c3da6143 Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 21:10:29 -0600
Subject: [PATCH 06/10] syntax and html errors

---
 templates/themes/categories/news.html | 5 +++--
 templates/themes/categories/theme.php | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 1c6de4bd..ee7da702 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -40,7 +40,7 @@
 					<tbody>
 						<tr>
 							<td class="minimal">
-								<span>{% trans Total %}</span>
+								<span>{% trans "Total" %}</span>
 							</td>
 							<td class="minimal">
 								<span>{{ stats.pph }}</span>
@@ -56,7 +56,8 @@
 								</td>
 								<td class="minimal">
 									<span>{{ boardStat.pph }}</span>
-								</td class="minimal">
+								</td>
+								<td class="minimal">
 									<span>{{ boardStat.recent_ips }}</span>
 								</td>
 							</tr>
diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 5b84095c..379eee8e 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -136,7 +136,7 @@
             }
 
             $stats['recent_ips'] = count($unique);
-            $stats['pph'] = count(array_column($stats['board'], 'pph'));
+            $stats['pph'] = count(array_column($stats['boards'], 'pph'));
 
             return $stats;
         }

From 02ed0c11a9d28d0d0169b0bed5bc32cfd6b31a5f Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 21:18:58 -0600
Subject: [PATCH 07/10] Changes count for sum

---
 templates/themes/categories/theme.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 379eee8e..51d212d2 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -136,7 +136,7 @@
             }
 
             $stats['recent_ips'] = count($unique);
-            $stats['pph'] = count(array_column($stats['boards'], 'pph'));
+            $stats['pph'] = array_sum(array_column($stats['boards'], 'pph'));
 
             return $stats;
         }

From 4eab810a3bdebc2ea23e08bd064f530ca15ae6b1 Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 21:47:53 -0600
Subject: [PATCH 08/10] Fixes style. I18s table headers

---
 templates/themes/categories/news.html | 56 +++++++++++++--------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index ee7da702..ca1b6522 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -25,46 +25,46 @@
 		{% endif %}
 	</div>
 		{% if stats %}
-			<div class="ban post">
+			<div class="ban" style="border: none; background: none;">
 				<h2 id="post-statistics">
 				{% trans "Post Statistics" %}
 				</h2>
-				<table class="modlog" style="width: 50%; text-align: left;">
-					<thead>
-						<tr>
-							<th>Board</th>
-							<th>PPH</th>
-							<th>Recent IPs</th>
-						</tr>
-						</thead>
-					<tbody>
+			</div>
+			<table class="modlog" style="width: 50%; text-align: left;">
+				<thead>
+					<tr>
+						<th>{% trans "Board" %}</th>
+						<th>{% trans "PPH" %}</th>
+						<th>{% trans "Recent IPs" %}</th>
+					</tr>
+					</thead>
+				<tbody>
+					<tr>
+						<td class="minimal">
+							<span>{% trans "Total" %}</span>
+						</td>
+						<td class="minimal">
+							<span>{{ stats.pph }}</span>
+						</td>
+						<td class="minimal">
+							<span>{{ stats.recent_ips }}</span>
+						</td>
+					</tr>
+					{% for boardStat in stats.boards %}
 						<tr>
 							<td class="minimal">
-								<span>{% trans "Total" %}</span>
+								<span>{{ boardStat.title }}</span>
 							</td>
 							<td class="minimal">
-								<span>{{ stats.pph }}</span>
+								<span>{{ boardStat.pph }}</span>
 							</td>
 							<td class="minimal">
-								<span>{{ stats.recent_ips }}</span>
+								<span>{{ boardStat.recent_ips }}</span>
 							</td>
 						</tr>
-						{% for boardStat in stats.boards %}
-							<tr>
-								<td class="minimal">
-									<span>{{ boardStat.title }}</span>
-								</td>
-								<td class="minimal">
-									<span>{{ boardStat.pph }}</span>
-								</td>
-								<td class="minimal">
-									<span>{{ boardStat.recent_ips }}</span>
-								</td>
-							</tr>
-						{% endfor %}
+					{% endfor %}
 				</tbody>
-				</table>
-			</div>
+			</table>
 		{% endif %}
 	<footer>
 			<p class="unimportant" style="margin-top:20px;text-align:center;">- Tinyboard +

From 3beb54ac2b36fe5be510d1c3b7527a9a826ac400 Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 21:49:43 -0600
Subject: [PATCH 09/10] h2 -> h1

---
 templates/themes/categories/news.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index ca1b6522..fa7f50cc 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -26,9 +26,9 @@
 	</div>
 		{% if stats %}
 			<div class="ban" style="border: none; background: none;">
-				<h2 id="post-statistics">
+				<h1 id="post-statistics">
 				{% trans "Post Statistics" %}
-				</h2>
+				</h1>
 			</div>
 			<table class="modlog" style="width: 50%; text-align: left;">
 				<thead>

From 9c4da9a13dd5a3e36e5194b0bfb42cf78d9f9ab9 Mon Sep 17 00:00:00 2001
From: nonmakina <nonmakina@leftypol.org>
Date: Tue, 19 Jan 2021 22:39:29 -0600
Subject: [PATCH 10/10] local vars

---
 templates/themes/categories/theme.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/themes/categories/theme.php b/templates/themes/categories/theme.php
index 51d212d2..e83359b3 100644
--- a/templates/themes/categories/theme.php
+++ b/templates/themes/categories/theme.php
@@ -101,6 +101,7 @@
         	}
 
         	$stats = [];
+        	$unique = [];
 
             foreach (array_merge(... $config['boards']) as $uri) {
             	$_board = getBoardInfo($uri);