diff options
| author | Markus Uhlin <markus@nifty-networks.net> | 2025-10-25 09:24:29 +0200 |
|---|---|---|
| committer | Markus Uhlin <markus@nifty-networks.net> | 2025-10-25 09:24:29 +0200 |
| commit | cd2434aa20f3e6104ddfdf0d449a4fc001f873e8 (patch) | |
| tree | 560ce651e8c7592c94229eda7b732e700bd70d30 | |
| parent | d01b637cb9453726e197b654418eba23445d1880 (diff) | |
Usage of settings_get()
| -rw-r--r-- | FICS/command.c | 11 | ||||
| -rw-r--r-- | FICS/command.h | 2 | ||||
| -rw-r--r-- | FICS/fics_addplayer.c | 3 | ||||
| -rw-r--r-- | FICS/playerdb.c | 3 |
4 files changed, 8 insertions, 11 deletions
diff --git a/FICS/command.c b/FICS/command.c index a69b80f..2589f5a 100644 --- a/FICS/command.c +++ b/FICS/command.c @@ -64,6 +64,7 @@ #include "playerdb.h" #include "ratings.h" #include "rmalloc.h" +#include "settings.h" #include "shutdown.h" #include "utils.h" #include "vers.h" @@ -97,10 +98,6 @@ PUBLIC char *usage_dir[NUM_LANGS] = { }; PUBLIC char *uscf_dir = DEFAULT_USCF; -PUBLIC char *hadmin_handle = HADMINHANDLE; -PRIVATE char *hadmin_email = HADMINEMAIL; -PRIVATE char *reg_addr = REGMAIL; - PUBLIC char fics_hostname[81]; PUBLIC int MailGameResult; PUBLIC int game_high; @@ -617,7 +614,7 @@ process_login(int p, char *loginname) "nobody from your site may login.\n"); pprintf(p, "If you wish to use this " "server please email %s\n", - reg_addr); + settings_get("REGMAIL")); pprintf(p, "Include details of a " "nick-name to be called here, " "e-mail address and your real name." @@ -1163,8 +1160,8 @@ process_new_connection(int fd, unsigned int fromHost) psend_raw_file(p, mess_dir, MESS_WELCOME); pprintf(p, "Head admin : %s Complaints to : %s\n", - hadmin_handle, - hadmin_email); + settings_get("HADMINHANDLE"), + settings_get("HADMINEMAIL")); pprintf(p, "Server location: %s Server version : %s\n", fics_hostname, VERS_NUM); psend_raw_file(p, mess_dir, MESS_LOGIN); diff --git a/FICS/command.h b/FICS/command.h index f7ca75f..63aa7e6 100644 --- a/FICS/command.h +++ b/FICS/command.h @@ -119,8 +119,6 @@ extern char *stats_dir; extern char *usage_dir[NUM_LANGS]; extern char *uscf_dir; -extern char *hadmin_handle; - extern char fics_hostname[81]; extern int MailGameResult; extern int game_high; diff --git a/FICS/fics_addplayer.c b/FICS/fics_addplayer.c index 825b295..18d42c4 100644 --- a/FICS/fics_addplayer.c +++ b/FICS/fics_addplayer.c @@ -158,7 +158,8 @@ main(int argc, char *argv[]) parray[p].registered = 1; parray[p].rated = 1; - if (strcasecmp(parray[p].login, HADMINHANDLE) == 0 || admin) { + if (strcasecmp(parray[p].login, settings_get("HADMINHANDLE")) == 0 || + admin) { parray[p].adminLevel = ADMIN_ADMIN; add_handle_to_list(parray[p].login); } diff --git a/FICS/playerdb.c b/FICS/playerdb.c index 8d6efa4..2b8ef04 100644 --- a/FICS/playerdb.c +++ b/FICS/playerdb.c @@ -72,6 +72,7 @@ #include "playerdb.h" #include "ratings.h" #include "rmalloc.h" +#include "settings.h" #include "talkproc.h" #include "utils.h" @@ -3256,5 +3257,5 @@ player_show_comments(int p, int p1) PUBLIC int player_ishead(int p) { - return (!strcasecmp(parray[p].name, hadmin_handle)); + return (strcasecmp(parray[p].name, settings_get("HADMINHANDLE")) == 0); } |