From 70dcde1f75f7699d09936bfdf045804559a89af7 Mon Sep 17 00:00:00 2001 From: Andrew Pamment Date: Sun, 25 Feb 2018 16:25:53 +1000 Subject: [PATCH] New Last 10 Callers --- .gitignore | 1 + STRINGS.CHANGES | 4 ++++ dist/ansis/bulletin1.ans | Bin 1091 -> 1177 bytes dist/magicka.strings | 2 +- dist/scripts/login_stanza.lua | 8 ++++++-- dist/www-bootstrap/static/newuser.png | Bin 0 -> 2527 bytes dist/www-bootstrap/static/style-mobile.css | 13 +++++++++++++ dist/www-bootstrap/static/style.css | 19 ++++++++++++++++--- src/bbs.c | 12 ++++++------ src/bbs.h | 1 + src/lua_glue.c | 6 +++--- src/www_last10.c | 14 +++++++++++--- 12 files changed, 62 insertions(+), 18 deletions(-) create mode 100644 dist/www-bootstrap/static/newuser.png diff --git a/.gitignore b/.gitignore index f15af53..b58b14e 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ core docs/site utils/reset_pass/reset_pass .vscode +last10v2.dat diff --git a/STRINGS.CHANGES b/STRINGS.CHANGES index 5484a9e..2201bb8 100644 --- a/STRINGS.CHANGES +++ b/STRINGS.CHANGES @@ -35,6 +35,10 @@ LINE: 280 NEW OLDSTRING: (NONE) NEWSTRING: "Read Now ? (Y / N): " +LINE: 5 MODIFIED +OLDSTRING: "\e[1;37m%-16s \e[1;36m%-32s \e[1;32m%02d:%02d %02d-%02d-%02d\e[0m\r\n" +NEWSTRING: "\e[1;37m%-16s \e[1;36m%-32s \e[1;32m%02d:%02d %02d-%02d-%02d \e[1;33m%c\e[0m\r\n" + Changes from v0.8-alpha -> v0.9-alpha -------------------------------------------------------------- LINE: 255 NEW diff --git a/dist/ansis/bulletin1.ans b/dist/ansis/bulletin1.ans index 84a8e84c6d33ae3578b6e54c83833508955cb110..8d24667de34fc1b533ed90a33a14cc0cbee51ca6 100644 GIT binary patch delta 79 zcmX@iF_Uw{XQs)UnFOVzqYZKuq@xXU-7<4h6&#CF6N?q{^Ay5UlO}Iuk`(dGEhx$_ jOHEO5EG@~;O)V}?Oi!Kskx6PZKQkXAlLX6Tc@`A_FwYrR delta 27 jcmbQqd6;9vXQs))%tDjnnb|fcG7B*>9b%qb%Ax`Qf$Rt> diff --git a/dist/magicka.strings b/dist/magicka.strings index 356fc3a..ed34b46 100644 --- a/dist/magicka.strings +++ b/dist/magicka.strings @@ -2,7 +2,7 @@ \r\n\r\nTimeout waiting for input..\r\n \r\n\e[1;37mLast 10 callers:\r\n \e[1;30m-------------------------------------------------------------------------------\r\n -\e[1;37m%-16s \e[1;36m%-32s \e[1;32m%02d:%02d %02d-%02d-%02d\e[0m\r\n +\e[1;37m%-16s \e[1;36m%-32s \e[1;32m%02d:%02d %02d-%02d-%02d \e[1;33m%c\e[0m\r\n \e[1;30m-------------------------------------------------------------------------------\e[0m\r\n \e[1;37mPress any key to continue...\e[0m\r\n \r\n\r\n\e[1;37mSystem Information\r\n diff --git a/dist/scripts/login_stanza.lua b/dist/scripts/login_stanza.lua index 1574bd7..27dc33b 100644 --- a/dist/scripts/login_stanza.lua +++ b/dist/scripts/login_stanza.lua @@ -60,9 +60,13 @@ bbs_write_string("\r\n\r\n\027[1;37mLast 10 callers:\r\n"); bbs_write_string("\027[1;30m-------------------------------------------------------------------------------\r\n"); while (i < 10) do - user, location, ltime = bbs_read_last10(i); + user, location, ltime, calls = bbs_read_last10(i); if (user ~= nil) then - bbs_write_string(string.format("\027[1;37m%-16s \027[1;36m%-32s \027[1;32m%s\r\n", user, location, os.date("%H:%M %d-%m-%y" ,ltime))); + if calls == 1 then + bbs_write_string(string.format("\027[1;37m%-16s \027[1;36m%-32s \027[1;32m%s \027[1;33mN\r\n", user, location, os.date("%H:%M %d-%m-%y" ,ltime))); + else + bbs_write_string(string.format("\027[1;37m%-16s \027[1;36m%-32s \027[1;32m%s\r\n", user, location, os.date("%H:%M %d-%m-%y" ,ltime))); + end end i = i + 1; diff --git a/dist/www-bootstrap/static/newuser.png b/dist/www-bootstrap/static/newuser.png new file mode 100644 index 0000000000000000000000000000000000000000..5950e993b7fdb8ae47b509d2b76b1e47af2095ee GIT binary patch literal 2527 zcmV<52_W`~P)000vR1^@s6*pu*Z00006VoOIv0JQ+M z0JT~AN8e zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00~D)L_t(o!|j+|Y#h}U$A5Qb zc6PnHvDfiu5+_bb9J1h$KoTIBrUYndLMW}&1XQGos->V*DiWf6M1lu+pr~yS5>Q$| zv}#jOk&09hDhZS}U=kWaAvJNZLlVcao%nOTJ2N{o_s&co)^@UXLe+;>YU!1(v@>(= zIcLxPpYy->2qs20o2>^nM^SV)u#o?cV?v0Z055fRb`AoFi9lT&MbWE3eBHWrw6?aQ zX&PY|5{4m$VN7WdLI4m&QQ7Zv4I#wT_kUG>`uj7-beYL@pJn4r9cPoBd=7$uj*bp? z@7@jI2_ZIhc6PoYve|5X6h%jyo12r5Jn{(XbeecP4#2>`0M9@FJlnQy``p3G^E@oe z;{N;Zr>CdK5kf2y*=+W9Ddp2IzW5@UOr~ssl#<(S`xe(`i@UW z)PH*9ayf3k`DS9V*d0a`MR&EewPBhjN~tozzP>)ztcsXb@fy2!W!SiJ;|yg30|N*l zXl!f*z%B;te0z+mE~}!tD#p;LKft-u)oYctOELhD3m&!}*I+ESjH~(%E&a zNKappFSX5{VNa@%*Zw?8+a*=h&WRWqzI}bkiAdf!!Bl`RMr{4RX#Ik)ly7DNcD7rqQ zIS(Zjqd6B%gv_Zom{X_I)L>vcl98NSW_Ng`i07#p{wSr8QjstC6kUl@3eQ)Jj(JF5 zao|v%eFt(R6VQLM$j;rv_`V{S_mNW3SgSLqPG?@d0a3v4SP?T8F}F_V)R4>T?+jx* zewjT@)5vDCL{YTV0LqH_bY#WjlG?dxHh;ayV^2QAcH89#e#&!ghQTalwTxi8J&}_%lDw z`RB!1FfYanubg6d)TN=;oRZTt4NcPkFeVpHB568%oEr3ih!ra{Y=6|JtLuGky`_a2grp9D#TMg(MzuVD6X7)9t zQYnHUC?f^Oku){Ld3XO9U%s*$r&vlE*OPqQl_!_?2*QYqmZnL>B2Etb96b?X**?7k z4tdL`d2Xys@9CNqU^_m(uLuGIDb>WY78yo7VniT`U^&|tQB)g&# z7@8VQmM%(RIX<4RaEc!7`}5e2B$F0pcEd278LS`(=jOOTbe?I^gx$)W> zE^J9tbbN-!JfbKhiXu!S$$9hRI7P`@dxm+leHefnuc;w!MrC%-imZG-Pe(@wQs%hj zrYf4}S74YLp#WVI5Kcr)6I5qRmM&d@VHh)mrAjrcCZmzAfP>w6ET@F5@w~^%3sQXX z(&{Pso<5hMQ4iZuY+7H#pZ4T%+<;^vI%}|`46q!D?@thllvs{LN`+E_c?|~NyrG8I zcaO5;4+GqD+XC#Oq^ZGR^M=~8nq?Jy)~u+6DB`0-HjVW&|IeAh(k4%=rfG8Bb=Ps{ zo!b}~`Wiobwvr#-+rzWZ94+xXfN6jRt1rv&gRKG2J^L8r3Bk z63g)?3T^}uXj(+U@@S|ri6$7?vJ`?4rNVPui9$L*Eikvip!=weR1zf>5B>ZYH(XuA zlIA2Qhl&&mKDAXEw&NkCz_KN}UMeSvxQ1=}IIctxa$!rH_Wfh5YE6PBb(yXU?1w8~Ua5l$458g--Ll z7$0_8CD>a&f86b`@1qBFB0i5a9VCci!4W-tw{RlC8E& z(meD;58X!#WEZE(?uoAJmNseGvSpvln>TOi)~#DfBogJ+YFYgB$M>*n=W-r@ypKq1 zWc8XW$mdH3&SS^A= zV_h6W7xbO3`u|AjTDudZou_;@w>+;l7Ptn)c*Cn#q z?CrkqKmEW14^UrUKjXIk=B{5O*hf|MS6O-SdURc%#!jm2;P$^Xgb)l44)XBB4`Z6< z9eQ0|U9YBT-`~4;Z)~zP6OYFcLQpIg`TfhUVi@ze^zyHePNxw^bJLy)!;tRoZhCrp pFbv~#KkJ`$N~br*KF^)fe*ju}_omdGqloginname); strcpy(new_entry.location, user->location); new_entry.time = time(NULL); - + new_entry.calls = user->timeson; if (i == 10) { j = 1; } else { j = 0; } - fptr = fopen("last10.dat", "wb"); + fptr = fopen("last10v2.dat", "wb"); for (;j
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", callers[z].name, callers[z].location, l10_time.tm_hour, l10_time.tm_min, l10_time.tm_mon + 1, l10_time.tm_mday, l10_time.tm_year - 100); + if (callers[z].calls == 1) { + sprintf(buffer, "
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", callers[z].name, callers[z].location, l10_time.tm_hour, l10_time.tm_min, l10_time.tm_mon + 1, l10_time.tm_mday, l10_time.tm_year - 100, conf.www_url); + } else { + sprintf(buffer, "
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", callers[z].name, callers[z].location, l10_time.tm_hour, l10_time.tm_min, l10_time.tm_mon + 1, l10_time.tm_mday, l10_time.tm_year - 100); + } } else { - sprintf(buffer, "
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", callers[z].name, callers[z].location, l10_time.tm_hour, l10_time.tm_min, l10_time.tm_mday, l10_time.tm_mon + 1, l10_time.tm_year - 100); + if (callers[z].calls == 1) { + sprintf(buffer, "
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", callers[z].name, callers[z].location, l10_time.tm_hour, l10_time.tm_min, l10_time.tm_mday, l10_time.tm_mon + 1, l10_time.tm_year - 100, conf.www_url); + } else { + sprintf(buffer, "
%s
%s
%.2d:%.2d %.2d-%.2d-%.2d
\n", callers[z].name, callers[z].location, l10_time.tm_hour, l10_time.tm_min, l10_time.tm_mday, l10_time.tm_mon + 1, l10_time.tm_year - 100); + } } if (len + strlen(buffer) > max_len - 1) { max_len += 4096;