External/energymech
1
0
Fork 0
mirror of https://github.com/EnergyMech/energymech.git synced 2025-12-17 15:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32 from joonicks/dev

Browse Source 
fix setpass, use server maxontime
This commit is contained in:
joonicks 2025-09-23 21:28:06 +02:00 committed by GitHub
commit 52c4e97f57
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/core.c
View File

@ -1073,6 +1073,10 @@ void update(SequenceTime *this)
temp = TEXT_NOTINSERVLIST; temp = TEXT_NOTINSERVLIST;
if ((sp = find_server(current->server))) if ((sp = find_server(current->server)))
{ {
int ot = (uint32_t)(now - current->ontime);
if (sp->maxontime < ot)
sp->maxontime = ot;
sprintf(globaldata,"%s:%i",(*sp->realname) ? sp->realname : sp->name,sp->port); sprintf(globaldata,"%s:%i",(*sp->realname) ? sp->realname : sp->name,sp->port);
temp = globaldata; temp = globaldata;
} }
@ -1486,15 +1490,28 @@ void do_server(COMMAND_ARGS)
*/ */
if (!server) if (!server)
{ {
char maxontime[36],*cuur;
int ot;
if (partyline_only_command(from)) if (partyline_only_command(from))
return; return;
if (servergrouplist->next) if (servergrouplist->next)
table_buffer(str_underline("server") "\t" str_underline("last connect") "\t" str_underline("group")); table_buffer(str_underline("server") "\t" str_underline("last connect") "\t"
str_underline("maxontime") "\t" str_underline("group"));
else else
table_buffer(str_underline("server") "\t" str_underline("last connect")); table_buffer(str_underline("server") "\t" str_underline("last connect") "\t" str_underline("maxontime"));
sgi = -1; sgi = -1;
for(sp=serverlist;sp;sp=sp->next) for(sp=serverlist;sp;sp=sp->next)
{ {
cuur = "";
if (sp->ident == current->server)
{
cuur = TEXT_CURRENT;
ot = now - current->ontime;
if (sp->maxontime < ot)
sp->maxontime = ot;
}
stringcpy(maxontime,(sp->maxontime == 0) ? TEXT_NEVER : idle2str(sp->maxontime,FALSE));
if (sp->lastconnect) if (sp->lastconnect)
last = idle2str(now - sp->lastconnect,FALSE); last = idle2str(now - sp->lastconnect,FALSE);
else else
@ -1534,13 +1551,12 @@ void do_server(COMMAND_ARGS)
if (sg) if (sg)
sgi = sg->servergroup; sgi = sg->servergroup;
} }
table_buffer("%s:%i\t%s%s%s\t%s",(*sp->realname) ? sp->realname : sp->name,sp->port, table_buffer("%s:%i\t%s%s%s\t%s\t%s",(*sp->realname) ? sp->realname : sp->name,sp->port,
last,(sp->lastconnect) ? TEXT_AGO : "",(sp->ident == current->server) ? TEXT_CURRENT : "", last,(sp->lastconnect) ? TEXT_AGO : "",cuur,maxontime,(sg) ? sg->name : "(unknown)");
(sg) ? sg->name : "(unknown)");
} }
else else
table_buffer("%s:%i\t%s%s%s",(*sp->realname) ? sp->realname : sp->name,sp->port, table_buffer("%s:%i\t%s%s%s\t%s",(*sp->realname) ? sp->realname : sp->name,sp->port,
last,(sp->lastconnect) ? TEXT_AGO : "",(sp->ident == current->server) ? TEXT_CURRENT : ""); last,(sp->lastconnect) ? TEXT_AGO : "",cuur,maxontime);
} }
table_send(from,2); table_send(from,2);
return; return;

2
src/user.c
View File

@ -1581,7 +1581,7 @@ void change_pass(User *user, char *pass)
char *enc; char *enc;
enc = makepass(pass); enc = makepass(pass);
if (strlen(user->pass) <= strlen(enc)) if (user->pass && strlen(user->pass) <= strlen(enc))
{ {
stringcpy(user->pass,enc); stringcpy(user->pass,enc);
#ifdef BOTNET #ifdef BOTNET