From d9c97540d574567305a71ffc17b77c33fd400266 Mon Sep 17 00:00:00 2001
From: Andrew Pamment <apamment@yandex.com>
Date: Sat, 13 Aug 2016 14:17:28 +1000
Subject: [PATCH] pretty up new mail scan

---
 mail_menu.c | 41 ++++++++++++++++++++++++++++++++++++-----
 main.c      |  1 +
 2 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/mail_menu.c b/mail_menu.c
index 0a914bd..0268f1c 100644
--- a/mail_menu.c
+++ b/mail_menu.c
@@ -1871,6 +1871,7 @@ void mail_scan(struct user_record *user) {
 	char c;
 	int i;
 	int j;
+	int lines = 0;
 
 	s_printf("\r\nScan for new mail? (Y/N) : ");
 	c = s_getc();
@@ -1880,7 +1881,13 @@ void mail_scan(struct user_record *user) {
 			if (conf.mail_conferences[i]->sec_level > user->sec_level) {
 				continue;
 			}
-			s_printf("\r\n%d. %s\r\n", i, conf.mail_conferences[i]->name);
+			s_printf("\r\n\e[1;32m%d. %s\e[0m\r\n", i, conf.mail_conferences[i]->name);
+			lines+=2;
+			if (lines == 22) {
+				s_printf("Press any key to continue...\r\n");
+				s_getc();
+				lines = 0;
+			}
 			for (j=0;j<conf.mail_conferences[i]->mail_area_count;j++) {
 				if (conf.mail_conferences[i]->mail_areas[j]->read_sec_level > user->sec_level) {
 					continue;
@@ -1903,12 +1910,24 @@ void mail_scan(struct user_record *user) {
 						msghs = read_message_headers(i, j, user);
 						if (msghs != NULL) {
 							if (msghs->msg_count > 0) {
-								s_printf("   --> %d. %s (%d new)\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, msghs->msg_count);
+								s_printf("\e[1;37m   --> %d. %s (%d new)\e[0m\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, msghs->msg_count);
+								lines++;
+								if (lines == 22) {
+									s_printf("Press any key to continue...\r\n");
+									s_getc();
+									lines = 0;
+								}
 							}
 							free_message_headers(msghs);
 						}
 					} else {
-						s_printf("   --> %d. %s (%d new)\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, jbh.ActiveMsgs);
+						s_printf("\e[1;37m   --> %d. %s (%d new)\e[0m\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, jbh.ActiveMsgs);
+						lines++;
+						if (lines == 22) {
+							s_printf("Press any key to continue...\r\n");
+							s_getc();
+							lines = 0;
+						}
 					}
 				} else {
 					if (jlr.HighReadMsg < (jbh.ActiveMsgs - 1)) {
@@ -1917,13 +1936,25 @@ void mail_scan(struct user_record *user) {
 							if (msghs != NULL) {
 								if (msghs->msg_count > 0) {
 									if (msghs->msgs[msghs->msg_count-1]->msg_no > jlr.HighReadMsg) {
-										s_printf("   --> %d. %s (%d new)\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, msghs->msgs[msghs->msg_count-1]->msg_no - jlr.HighReadMsg);
+										s_printf("\e[1;37m   --> %d. %s (%d new)\e[0m\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, msghs->msgs[msghs->msg_count-1]->msg_no - jlr.HighReadMsg);
+										lines++;
+										if (lines == 22) {
+											s_printf("Press any key to continue...\r\n");
+											s_getc();
+											lines = 0;
+										}
 									}
 								}
 								free_message_headers(msghs);
 							}
 						} else {
-							s_printf("   --> %d. %s (%d new)\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, (jbh.ActiveMsgs - 1) - jlr.HighReadMsg);
+							s_printf("\e[1;37m   --> %d. %s (%d new)\e[0m\r\n", j, conf.mail_conferences[i]->mail_areas[j]->name, (jbh.ActiveMsgs - 1) - jlr.HighReadMsg);
+							lines++;
+							if (lines == 22) {
+								s_printf("Press any key to continue...\r\n");
+								s_getc();
+								lines = 0;
+							}
 						}
 					} else {
 						JAM_CloseMB(jb);
diff --git a/main.c b/main.c
index 7c859e9..52f8112 100644
--- a/main.c
+++ b/main.c
@@ -656,6 +656,7 @@ void server(int port) {
 		ssh_pid = fork();
 
 		if (ssh_pid == 0) {
+			ssh_pid = -1;
 			serverssh(conf.ssh_port);
 			exit(0);
 		}