Added Some suggestions Avon had

This commit is contained in:
Andrew Pamment 2016-04-22 21:48:52 +10:00
parent 5494341932
commit 79693919af
3 changed files with 10 additions and 6 deletions

View File

@ -748,9 +748,9 @@ void read_message(int socket, struct user_record *user, struct msg_headers *msgh
sprintf(buffer, "\e[2J\e[1;32mFrom : \e[1;37m%s\r\n", msghs->msgs[mailno]->from); sprintf(buffer, "\e[2J\e[1;32mFrom : \e[1;37m%s\r\n", msghs->msgs[mailno]->from);
} }
s_putstring(socket, buffer); s_putstring(socket, buffer);
sprintf(buffer, "\e[1;32mTo : \e[1;37m%s\r\n", msghs->msgs[mailno]->to); sprintf(buffer, "\e[1;32mTo : \e[1;37m%-40s Area : %-37s\r\n", msghs->msgs[mailno]->to, conf.mail_conferences[user->cur_mail_conf]->mail_areas[user->cur_mail_area]->name);
s_putstring(socket, buffer); s_putstring(socket, buffer);
sprintf(buffer, "\e[1;32mSubject : \e[1;37m%s\r\n", msghs->msgs[mailno]->subject); sprintf(buffer, "\e[1;32mSubject : \e[1;37m%-40s MsgNo : %4d of %4d\r\n", msghs->msgs[mailno]->subject, mailno, msghs->msg_count);
s_putstring(socket, buffer); s_putstring(socket, buffer);
localtime_r((time_t *)&msghs->msgs[mailno]->msg_h->DateWritten, &msg_date); localtime_r((time_t *)&msghs->msgs[mailno]->msg_h->DateWritten, &msg_date);
sprintf(buffer, "\e[1;32mDate : \e[1;37m%s", asctime(&msg_date)); sprintf(buffer, "\e[1;32mDate : \e[1;37m%s", asctime(&msg_date));
@ -811,7 +811,7 @@ void read_message(int socket, struct user_record *user, struct msg_headers *msgh
s_putstring(socket, "\r\n"); s_putstring(socket, "\r\n");
lines++; lines++;
if (lines >= 17) { if (lines >= 17) {
s_putstring(socket, "Press a key to continue..."); s_putstring(socket, "\e[1;37mPress a key to continue...\e[0m");
s_getc(socket); s_getc(socket);
lines = 0; lines = 0;
s_putstring(socket, "\e[7;1H\e[0J"); s_putstring(socket, "\e[7;1H\e[0J");
@ -883,7 +883,7 @@ void read_message(int socket, struct user_record *user, struct msg_headers *msgh
} }
} }
s_putstring(socket, "Press R to reply, Q to quit, SPACE for Next Mesage..."); s_putstring(socket, "\r\n\e[1;37mPress \e[1;36mR \e[1;37mto reply, \e[1;36mQ \e[1;37mto quit, \e[1;36mB \e[1;37mto go Back, \e[1;36mSPACE \e[1;37mfor Next Mesage...");
c = s_getc(socket); c = s_getc(socket);
@ -1168,6 +1168,10 @@ void read_message(int socket, struct user_record *user, struct msg_headers *msgh
s_putstring(socket, "\r\n\r\nNo more messages\r\n"); s_putstring(socket, "\r\n\r\nNo more messages\r\n");
doquit = 1; doquit = 1;
} }
} else if (tolower(c) == 'b') {
if (mailno > 0) {
mailno--;
}
} }
} }
} }

View File

@ -10,7 +10,7 @@ void settings_menu(int sock, struct user_record *user) {
char c; char c;
while (!dosettings) { while (!dosettings) {
s_putstring(sock, "\r\n\e[1;32mYour Settings\r\n"); s_putstring(sock, "\e[2J\e[1;32mYour Settings\r\n");
s_putstring(sock, "\e[1;30m-------------------------------------------------------------------------------\e[0m\r\n"); s_putstring(sock, "\e[1;30m-------------------------------------------------------------------------------\e[0m\r\n");
s_putstring(sock, "\e[0;36mP. \e[1;37mPassword (\e[1;33mNot Shown\e[1;37m)\r\n"); s_putstring(sock, "\e[0;36mP. \e[1;37mPassword (\e[1;33mNot Shown\e[1;37m)\r\n");
sprintf(buffer, "\e[0;36mL. \e[1;37mLocation (\e[1;33m%s\e[1;37m)\r\n", user->location); sprintf(buffer, "\e[0;36mL. \e[1;37mLocation (\e[1;33m%s\e[1;37m)\r\n", user->location);

View File

@ -283,7 +283,7 @@ void list_users(int socket, struct user_record *user) {
sqlite3_close(db); sqlite3_close(db);
exit(1); exit(1);
} }
s_putstring(socket, "\r\n\e[1;30m-------------------------------------------------------------------------------\e[0m\r\n"); s_putstring(socket, "\e[2J\e[1;30m-------------------------------------------------------------------------------\e[0m\r\n");
s_putstring(socket, "User Name Location Times On\r\n"); s_putstring(socket, "User Name Location Times On\r\n");
s_putstring(socket, "\e[1;30m-------------------------------------------------------------------------------\e[0m\r\n"); s_putstring(socket, "\e[1;30m-------------------------------------------------------------------------------\e[0m\r\n");
i = 0; i = 0;