diff options
Diffstat (limited to 'src/ladmin')
| -rw-r--r-- | src/ladmin/ladmin.cpp | 6393 | ||||
| -rw-r--r-- | src/ladmin/ladmin.hpp | 11 |
2 files changed, 1818 insertions, 4586 deletions
diff --git a/src/ladmin/ladmin.cpp b/src/ladmin/ladmin.cpp index dbad7bb..d6a30dd 100644 --- a/src/ladmin/ladmin.cpp +++ b/src/ladmin/ladmin.cpp @@ -1,66 +1,44 @@ -// $Id: ladmin.c,v 1.1.1.1 2004/09/10 17:26:52 MagicalTux Exp $ -/////////////////////////////////////////////////////////////////////////// -// EAthena login-server remote administration tool -// Ladamin in C by [Yor] -// if you modify this software, modify ladmin in tool too. -/////////////////////////////////////////////////////////////////////////// - -#include <sys/types.h> -#include <sys/socket.h> -#include <stdio.h> -#include <stdlib.h> -#include <netinet/in.h> -#include <sys/time.h> // gettimeofday -#include <time.h> -#include <sys/ioctl.h> -#include <unistd.h> // close -#include <signal.h> -#include <fcntl.h> -#include <string.h> // str* -#include <arpa/inet.h> // inet_addr -#include <netdb.h> // gethostbyname -#include <stdarg.h> // valist -#include <ctype.h> // tolower +#include <arpa/inet.h> +#include <netdb.h> +#include <unistd.h> + +#include <fstream> + +#include "../common/cxxstdio.hpp" #include "../common/core.hpp" +#include "../common/md5calc.hpp" #include "../common/socket.hpp" -#include "ladmin.hpp" #include "../common/version.hpp" -#include "../common/mmo.hpp" +#include "../common/utils.hpp" -#ifdef PASSWORDENC -#include "../common/md5calc.hpp" -#endif +#include "../poison.hpp" -#ifdef MEMWATCH -#include "memwatch.hpp" -#endif +#define LADMIN_CONF_NAME "conf/ladmin_athena.conf" -int eathena_interactive_session; // from core.c -#define Iprintf if (eathena_interactive_session) printf +static +int eathena_interactive_session; +#define Iprintf if (eathena_interactive_session) PRINTF //-------------------------------INSTRUCTIONS------------------------------ // Set the variables below: // IP of the login server. // Port where the login-server listens incoming packets. // Password of administration (same of config_athena.conf). -// Displayed language of the sofware (if not correct, english is used). // IMPORTANT: // Be sure that you authorize remote administration in login-server // (see login_athena.conf, 'admin_state' parameter) //------------------------------------------------------------------------- +static char loginserverip[16] = "127.0.0.1"; // IP of login-server -int loginserverport = 6900; // Port of login-server +static +int loginserverport = 6900; // Port of login-server +static char loginserveradminpassword[24] = "admin"; // Administration password -#ifdef PASSWORDENC -int passenc = 2; // Encoding type of the password -#else -int passenc = 0; // Encoding type of the password -#endif -char defaultlanguage = 'E'; // Default language (F: Français/E: English) - // (if it's not 'F', default is English) +static +int passenc = 2; // Encoding type of the password +static char ladmin_log_filename[1024] = "log/ladmin.log"; -char date_format[32] = "%Y-%m-%d %H:%M:%S"; //------------------------------------------------------------------------- // LIST of COMMANDs that you can type at the prompt: // To use these commands you can only type only the first letters. @@ -70,9 +48,9 @@ char date_format[32] = "%Y-%m-%d %H:%M:%S"; // // Note: every time you must give a account_name, you can use "" or '' (spaces can be included) // -// aide/help/? +// help/? // Display the description of the commands -// aide/help/? [command] +// help/? [command] // Display the description of the specified command // // add <account_name> <sex> <password> @@ -148,9 +126,6 @@ char date_format[32] = "%Y-%m-%d %H:%M:%S"; // kamib <message> // Sends a broadcast message on all map-server (in blue). // -// language <language> -// Change the language of displaying. -// // list/ls [start_id [end_id]] // Display a list of accounts. // 'start_id', 'end_id': indicate end and start identifiers. @@ -244,152 +219,88 @@ char date_format[32] = "%Y-%m-%d %H:%M:%S"; // Displays complete information of an account. // //------------------------------------------------------------------------- -int login_fd; -int login_ip; -int bytes_to_read = 0; // flag to know if we waiting bytes from login-server -char command[1024]; -char parameters[1024]; -int list_first, list_last, list_type, list_count; // parameter to display a list of accounts -int already_exit_function = 0; // sometimes, the exit function is called twice... so, don't log twice the message +static +int login_fd; +static +int login_ip; +static +int bytes_to_read = 0; // flag to know if we waiting bytes from login-server +static +char parameters[1024]; // needs to be global since it's passed to the parse function +// really should be added to session data +static +int list_first, list_last, list_type, list_count; // parameter to display a list of accounts +static +int already_exit_function = 0; // sometimes, the exit function is called twice... so, don't log twice the message //------------------------------ // Writing function of logs file //------------------------------ -static __attribute__((format(printf, 1, 2))) -int ladmin_log (const char *fmt, ...); -int ladmin_log (const char *fmt, ...) +#define LADMIN_LOG(fmt, ...) \ + ladmin_log(static_cast<const std::string&>(STRPRINTF(fmt, ## __VA_ARGS__))) +static +void ladmin_log(const_string line) { - FILE *logfp; - va_list ap; - struct timeval tv; - char tmpstr[2048]; - - va_start (ap, fmt); - - logfp = fopen_ (ladmin_log_filename, "a"); - if (logfp) - { - if (fmt[0] == '\0') // jump a line if no message - fprintf (logfp, "\n"); - else - { - gettimeofday (&tv, NULL); - strftime (tmpstr, 24, date_format, localtime (&(tv.tv_sec))); - sprintf (tmpstr + strlen (tmpstr), ".%03d: %s", - (int) tv.tv_usec / 1000, fmt); - vfprintf (logfp, tmpstr, ap); - } - fclose_ (logfp); - } - - va_end (ap); - return 0; + FILE *logfp = fopen_(ladmin_log_filename, "a"); + if (!logfp) + return; + log_with_timestamp(logfp, line); + fclose_(logfp); } //--------------------------------------------- // Function to return ordonal text of a number. //--------------------------------------------- static -const char *makeordinal (int number) +const char *makeordinal(int number) { - if (defaultlanguage == 'F') + if ((number % 10) < 4 && (number % 10) != 0 + && (number < 10 || number > 20)) { - if (number == 0) - return ""; - else if (number == 1) - return "er"; + if ((number % 10) == 1) + return "st"; + else if ((number % 10) == 2) + return "nd"; else - return "ème"; + return "rd"; } else { - if ((number % 10) < 4 && (number % 10) != 0 - && (number < 10 || number > 20)) - { - if ((number % 10) == 1) - return "st"; - else if ((number % 10) == 2) - return "nd"; - else - return "rd"; - } - else - { - return "th"; - } + return "th"; } - return ""; } //----------------------------------------------------------------------------------------- // Function to test of the validity of an account name (return 0 if incorrect, and 1 if ok) //----------------------------------------------------------------------------------------- static -int verify_accountname (const char *account_name) +int verify_accountname(const char *account_name) { - int i; + int i; for (i = 0; account_name[i]; i++) { if (account_name[i] < 32) { - if (defaultlanguage == 'F') - { - printf - ("Caractère interdit trouvé dans le nom du compte (%d%s caractère).\n", - i + 1, makeordinal (i + 1)); - ladmin_log - ("Caractère interdit trouvé dans le nom du compte (%d%s caractère).\n", - i + 1, makeordinal (i + 1)); - } - else - { - printf - ("Illegal character found in the account name (%d%s character).\n", - i + 1, makeordinal (i + 1)); - ladmin_log - ("Illegal character found in the account name (%d%s character).\n", - i + 1, makeordinal (i + 1)); - } + PRINTF("Illegal character found in the account name (%d%s character).\n", + i + 1, makeordinal(i + 1)); + LADMIN_LOG("Illegal character found in the account name (%d%s character).\n", + i + 1, makeordinal(i + 1)); return 0; } } - if (strlen (account_name) < 4) + if (strlen(account_name) < 4) { - if (defaultlanguage == 'F') - { - printf - ("Nom du compte trop court. Entrez un nom de compte de 4-23 caractères.\n"); - ladmin_log - ("Nom du compte trop court. Entrez un nom de compte de 4-23 caractères.\n"); - } - else - { - printf - ("Account name is too short. Please input an account name of 4-23 bytes.\n"); - ladmin_log - ("Account name is too short. Please input an account name of 4-23 bytes.\n"); - } + PRINTF("Account name is too short. Please input an account name of 4-23 bytes.\n"); + LADMIN_LOG("Account name is too short. Please input an account name of 4-23 bytes.\n"); return 0; } - if (strlen (account_name) > 23) + if (strlen(account_name) > 23) { - if (defaultlanguage == 'F') - { - printf - ("Nom du compte trop long. Entrez un nom de compte de 4-23 caractères.\n"); - ladmin_log - ("Nom du compte trop long. Entrez un nom de compte de 4-23 caractères.\n"); - } - else - { - printf - ("Account name is too long. Please input an account name of 4-23 bytes.\n"); - ladmin_log - ("Account name is too long. Please input an account name of 4-23 bytes.\n"); - } + PRINTF("Account name is too long. Please input an account name of 4-23 bytes.\n"); + LADMIN_LOG("Account name is too long. Please input an account name of 4-23 bytes.\n"); return 0; } @@ -400,75 +311,39 @@ int verify_accountname (const char *account_name) // Sub-function: Input of a password //---------------------------------- static -int typepasswd (char *password) +int typepasswd(char *password) { char password1[1023], password2[1023]; - int letter; - int i; + int letter; + int i; - if (defaultlanguage == 'F') - { - ladmin_log - ("Aucun mot de passe n'a été donné. Demande d'un mot de passe.\n"); - } - else - { - ladmin_log ("No password was given. Request to obtain a password.\n"); - } + LADMIN_LOG("No password was given. Request to obtain a password.\n"); - memset (password1, '\0', sizeof (password1)); - memset (password2, '\0', sizeof (password2)); - if (defaultlanguage == 'F') - printf ("\033[1;36m Entrez le mot de passe > \033[0;32;42m"); - else - printf ("\033[1;36m Type the password > \033[0;32;42m"); + memset(password1, '\0', sizeof(password1)); + memset(password2, '\0', sizeof(password2)); + PRINTF("\033[1;36m Type the password > \033[0;32;42m"); i = 0; - while ((letter = getchar ()) != '\n') + while ((letter = getchar()) != '\n') password1[i++] = letter; - if (defaultlanguage == 'F') - printf - ("\033[0m\033[1;36m Ré-entrez le mot de passe > \033[0;32;42m"); - else - printf ("\033[0m\033[1;36m Verify the password > \033[0;32;42m"); + PRINTF("\033[0m\033[1;36m Verify the password > \033[0;32;42m"); i = 0; - while ((letter = getchar ()) != '\n') + while ((letter = getchar()) != '\n') password2[i++] = letter; - printf ("\033[0m"); - fflush (stdout); - fflush (stdin); + PRINTF("\033[0m"); + fflush(stdout); + fflush(stdin); - if (strcmp (password1, password2) != 0) + if (strcmp(password1, password2) != 0) { - if (defaultlanguage == 'F') - { - printf - ("Erreur de vérification du mot de passe: Saisissez le même mot de passe svp.\n"); - ladmin_log - ("Erreur de vérification du mot de passe: Saisissez le même mot de passe svp.\n"); - ladmin_log (" Premier mot de passe: %s, second mot de passe: %s.\n", - password1, password2); - } - else - { - printf - ("Password verification failed. Please input same password.\n"); - ladmin_log - ("Password verification failed. Please input same password.\n"); - ladmin_log (" First password: %s, second password: %s.\n", - password1, password2); - } + PRINTF("Password verification failed. Please input same password.\n"); + LADMIN_LOG("Password verification failed. Please input same password.\n"); + LADMIN_LOG(" First password: %s, second password: %s.\n", + password1, password2); return 0; } - if (defaultlanguage == 'F') - { - ladmin_log ("Mot de passe saisi: %s.\n", password1); - } - else - { - ladmin_log ("Typed password: %s.\n", password1); - } - strcpy (password, password1); + LADMIN_LOG("Typed password: %s.\n", password1); + strcpy(password, password1); return 1; } @@ -476,71 +351,33 @@ int typepasswd (char *password) // Sub-function: Test of the validity of password (return 0 if incorrect, and 1 if ok) //------------------------------------------------------------------------------------ static -int verify_password (const char *password) +int verify_password(const char *password) { - int i; + int i; for (i = 0; password[i]; i++) { if (password[i] < 32) { - if (defaultlanguage == 'F') - { - printf - ("Caractère interdit trouvé dans le mot de passe (%d%s caractère).\n", - i + 1, makeordinal (i + 1)); - ladmin_log - ("Caractère interdit trouvé dans le nom du compte (%d%s caractère).\n", - i + 1, makeordinal (i + 1)); - } - else - { - printf - ("Illegal character found in the password (%d%s character).\n", - i + 1, makeordinal (i + 1)); - ladmin_log - ("Illegal character found in the password (%d%s character).\n", - i + 1, makeordinal (i + 1)); - } + PRINTF("Illegal character found in the password (%d%s character).\n", + i + 1, makeordinal(i + 1)); + LADMIN_LOG("Illegal character found in the password (%d%s character).\n", + i + 1, makeordinal(i + 1)); return 0; } } - if (strlen (password) < 4) + if (strlen(password) < 4) { - if (defaultlanguage == 'F') - { - printf - ("Nom du compte trop court. Entrez un nom de compte de 4-23 caractères.\n"); - ladmin_log - ("Nom du compte trop court. Entrez un nom de compte de 4-23 caractères.\n"); - } - else - { - printf - ("Account name is too short. Please input an account name of 4-23 bytes.\n"); - ladmin_log - ("Account name is too short. Please input an account name of 4-23 bytes.\n"); - } + PRINTF("Account name is too short. Please input an account name of 4-23 bytes.\n"); + LADMIN_LOG("Account name is too short. Please input an account name of 4-23 bytes.\n"); return 0; } - if (strlen (password) > 23) + if (strlen(password) > 23) { - if (defaultlanguage == 'F') - { - printf - ("Mot de passe trop long. Entrez un mot de passe de 4-23 caractères.\n"); - ladmin_log - ("Mot de passe trop long. Entrez un mot de passe de 4-23 caractères.\n"); - } - else - { - printf - ("Password is too long. Please input a password of 4-23 bytes.\n"); - ladmin_log - ("Password is too long. Please input a password of 4-23 bytes.\n"); - } + PRINTF("Password is too long. Please input a password of 4-23 bytes.\n"); + LADMIN_LOG("Password is too long. Please input a password of 4-23 bytes.\n"); return 0; } @@ -551,126 +388,122 @@ int verify_password (const char *password) // Sub-function: Check the name of a command (return complete name) //----------------------------------------------------------------- static -int check_command (char *command) +int check_command(char *command) { // help - if (strncmp (command, "aide", 2) == 0 && strncmp (command, "aide", strlen (command)) == 0) // not 1 letter command: 'aide' or 'add'? - strcpy (command, "aide"); - else if (strncmp (command, "help", 1) == 0 - && strncmp (command, "help", strlen (command)) == 0) - strcpy (command, "help"); + if (strncmp(command, "help", 1) == 0 + && strncmp(command, "help", strlen(command)) == 0) + strcpy(command, "help"); // general commands - else if (strncmp (command, "add", 2) == 0 && strncmp (command, "add", strlen (command)) == 0) // not 1 letter command: 'aide' or 'add'? - strcpy (command, "add"); - else if ((strncmp (command, "ban", 3) == 0 - && strncmp (command, "ban", strlen (command)) == 0) - || (strncmp (command, "banish", 4) == 0 - && strncmp (command, "banish", strlen (command)) == 0)) - strcpy (command, "ban"); - else if ((strncmp (command, "banadd", 4) == 0 && strncmp (command, "banadd", strlen (command)) == 0) || // not 1 letter command: 'ba' or 'bs'? 'banadd' or 'banset' ? - strcmp (command, "ba") == 0) - strcpy (command, "banadd"); - else if ((strncmp (command, "banset", 4) == 0 && strncmp (command, "banset", strlen (command)) == 0) || // not 1 letter command: 'ba' or 'bs'? 'banadd' or 'banset' ? - strcmp (command, "bs") == 0) - strcpy (command, "banset"); - else if (strncmp (command, "block", 2) == 0 - && strncmp (command, "block", strlen (command)) == 0) - strcpy (command, "block"); - else if (strncmp (command, "check", 2) == 0 && strncmp (command, "check", strlen (command)) == 0) // not 1 letter command: 'check' or 'create'? - strcpy (command, "check"); - else if (strncmp (command, "create", 2) == 0 && strncmp (command, "create", strlen (command)) == 0) // not 1 letter command: 'check' or 'create'? - strcpy (command, "create"); - else if (strncmp (command, "delete", 1) == 0 - && strncmp (command, "delete", strlen (command)) == 0) - strcpy (command, "delete"); - else if ((strncmp (command, "email", 2) == 0 && strncmp (command, "email", strlen (command)) == 0) || // not 1 letter command: 'email', 'end' or 'exit'? - (strncmp (command, "e-mail", 2) == 0 - && strncmp (command, "e-mail", strlen (command)) == 0)) - strcpy (command, "email"); - else if (strncmp (command, "getcount", 2) == 0 && strncmp (command, "getcount", strlen (command)) == 0) // not 1 letter command: 'getcount' or 'gm'? - strcpy (command, "getcount"); + else if (strncmp(command, "add", 2) == 0 && strncmp(command, "add", strlen(command)) == 0) + strcpy(command, "add"); + else if ((strncmp(command, "ban", 3) == 0 + && strncmp(command, "ban", strlen(command)) == 0) + ||(strncmp(command, "banish", 4) == 0 + && strncmp(command, "banish", strlen(command)) == 0)) + strcpy(command, "ban"); + else if ((strncmp(command, "banadd", 4) == 0 && strncmp(command, "banadd", strlen(command)) == 0) || // not 1 letter command: 'ba' or 'bs'? 'banadd' or 'banset' ? + strcmp(command, "ba") == 0) + strcpy(command, "banadd"); + else if ((strncmp(command, "banset", 4) == 0 && strncmp(command, "banset", strlen(command)) == 0) || // not 1 letter command: 'ba' or 'bs'? 'banadd' or 'banset' ? + strcmp(command, "bs") == 0) + strcpy(command, "banset"); + else if (strncmp(command, "block", 2) == 0 + && strncmp(command, "block", strlen(command)) == 0) + strcpy(command, "block"); + else if (strncmp(command, "check", 2) == 0 && strncmp(command, "check", strlen(command)) == 0) // not 1 letter command: 'check' or 'create'? + strcpy(command, "check"); + else if (strncmp(command, "create", 2) == 0 && strncmp(command, "create", strlen(command)) == 0) // not 1 letter command: 'check' or 'create'? + strcpy(command, "create"); + else if (strncmp(command, "delete", 1) == 0 + && strncmp(command, "delete", strlen(command)) == 0) + strcpy(command, "delete"); + else if ((strncmp(command, "email", 2) == 0 && strncmp(command, "email", strlen(command)) == 0) || // not 1 letter command: 'email', 'end' or 'exit'? + (strncmp(command, "e-mail", 2) == 0 + && strncmp(command, "e-mail", strlen(command)) == 0)) + strcpy(command, "email"); + else if (strncmp(command, "getcount", 2) == 0 && strncmp(command, "getcount", strlen(command)) == 0) // not 1 letter command: 'getcount' or 'gm'? + strcpy(command, "getcount"); // else if (strncmp(command, "gm", 2) == 0 && strncmp(command, "gm", strlen(command)) == 0) // not 1 letter command: 'getcount' or 'gm'? // strcpy(command, "gm"); // else if (strncmp(command, "id", 2) == 0 && strncmp(command, "id", strlen(command)) == 0) // not 1 letter command: 'id' or 'info'? // strcpy(command, "id"); - else if (strncmp (command, "info", 2) == 0 && strncmp (command, "info", strlen (command)) == 0) // not 1 letter command: 'id' or 'info'? - strcpy (command, "info"); + else if (strncmp(command, "info", 2) == 0 && strncmp(command, "info", strlen(command)) == 0) // not 1 letter command: 'id' or 'info'? + strcpy(command, "info"); // else if (strncmp(command, "kami", 4) == 0 && strncmp(command, "kami", strlen(command)) == 0) // only all letters command: 'kami' or 'kamib'? // strcpy(command, "kami"); // else if (strncmp(command, "kamib", 5) == 0 && strncmp(command, "kamib", strlen(command)) == 0) // only all letters command: 'kami' or 'kamib'? // strcpy(command, "kamib"); - else if ((strncmp (command, "language", 2) == 0 && strncmp (command, "language", strlen (command)) == 0)) // not 1 letter command: 'language' or 'list'? - strcpy (command, "language"); - else if ((strncmp (command, "list", 2) == 0 && strncmp (command, "list", strlen (command)) == 0) || // 'list' is default list command // not 1 letter command: 'language' or 'list'? - strcmp (command, "ls") == 0) - strcpy (command, "list"); - else if (strncmp (command, "itemfrob", 6) == 0) - strcpy (command, "itemfrob"); - else if ((strncmp (command, "listban", 5) == 0 - && strncmp (command, "listban", strlen (command)) == 0) - || (strncmp (command, "lsban", 3) == 0 - && strncmp (command, "lsban", strlen (command)) == 0) - || strcmp (command, "lb") == 0) - strcpy (command, "listban"); - else if ((strncmp (command, "listgm", 5) == 0 - && strncmp (command, "listgm", strlen (command)) == 0) - || (strncmp (command, "lsgm", 3) == 0 - && strncmp (command, "lsgm", strlen (command)) == 0) - || strcmp (command, "lg") == 0) - strcpy (command, "listgm"); - else if ((strncmp (command, "listok", 5) == 0 - && strncmp (command, "listok", strlen (command)) == 0) - || (strncmp (command, "lsok", 3) == 0 - && strncmp (command, "lsok", strlen (command)) == 0) - || strcmp (command, "lo") == 0) - strcpy (command, "listok"); - else if (strncmp (command, "memo", 1) == 0 - && strncmp (command, "memo", strlen (command)) == 0) - strcpy (command, "memo"); - else if (strncmp (command, "name", 1) == 0 - && strncmp (command, "name", strlen (command)) == 0) - strcpy (command, "name"); - else if ((strncmp (command, "password", 1) == 0 - && strncmp (command, "password", strlen (command)) == 0) - || strcmp (command, "passwd") == 0) - strcpy (command, "password"); - else if (strncmp (command, "reloadgm", 1) == 0 - && strncmp (command, "reloadgm", strlen (command)) == 0) - strcpy (command, "reloadgm"); - else if (strncmp (command, "search", 3) == 0 && strncmp (command, "search", strlen (command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'? - strcpy (command, "search"); // not 2 letters command: 'search' or 'sex'? + else if ((strncmp(command, "list", 2) == 0 && strncmp(command, "list", strlen(command)) == 0) || // 'list' is default list command + strcmp(command, "ls") == 0) + strcpy(command, "list"); + else if (strncmp(command, "itemfrob", 6) == 0) + strcpy(command, "itemfrob"); + else if ((strncmp(command, "listban", 5) == 0 + && strncmp(command, "listban", strlen(command)) == 0) + ||(strncmp(command, "lsban", 3) == 0 + && strncmp(command, "lsban", strlen(command)) == 0) + || strcmp(command, "lb") == 0) + strcpy(command, "listban"); + else if ((strncmp(command, "listgm", 5) == 0 + && strncmp(command, "listgm", strlen(command)) == 0) + ||(strncmp(command, "lsgm", 3) == 0 + && strncmp(command, "lsgm", strlen(command)) == 0) + || strcmp(command, "lg") == 0) + strcpy(command, "listgm"); + else if ((strncmp(command, "listok", 5) == 0 + && strncmp(command, "listok", strlen(command)) == 0) + ||(strncmp(command, "lsok", 3) == 0 + && strncmp(command, "lsok", strlen(command)) == 0) + || strcmp(command, "lo") == 0) + strcpy(command, "listok"); + else if (strncmp(command, "memo", 1) == 0 + && strncmp(command, "memo", strlen(command)) == 0) + strcpy(command, "memo"); + else if (strncmp(command, "name", 1) == 0 + && strncmp(command, "name", strlen(command)) == 0) + strcpy(command, "name"); + else if ((strncmp(command, "password", 1) == 0 + && strncmp(command, "password", strlen(command)) == 0) + || strcmp(command, "passwd") == 0) + strcpy(command, "password"); + else if (strncmp(command, "reloadgm", 1) == 0 + && strncmp(command, "reloadgm", strlen(command)) == 0) + strcpy(command, "reloadgm"); + else if (strncmp(command, "search", 3) == 0 && strncmp(command, "search", strlen(command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'? + strcpy(command, "search"); // not 2 letters command: 'search' or 'sex'? // else if (strncmp(command, "sex", 3) == 0 && strncmp(command, "sex", strlen(command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'? // strcpy(command, "sex"); // not 2 letters command: 'search' or 'sex'? - else if (strncmp (command, "state", 2) == 0 && strncmp (command, "state", strlen (command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'? - strcpy (command, "state"); - else if ((strncmp (command, "timeadd", 5) == 0 && strncmp (command, "timeadd", strlen (command)) == 0) || // not 1 letter command: 'ta' or 'ts'? 'timeadd' or 'timeset'? - strcmp (command, "ta") == 0) - strcpy (command, "timeadd"); - else if ((strncmp (command, "timeset", 5) == 0 && strncmp (command, "timeset", strlen (command)) == 0) || // not 1 letter command: 'ta' or 'ts'? 'timeadd' or 'timeset'? - strcmp (command, "ts") == 0) - strcpy (command, "timeset"); - else if ((strncmp (command, "unban", 5) == 0 - && strncmp (command, "unban", strlen (command)) == 0) - || (strncmp (command, "unbanish", 4) == 0 - && strncmp (command, "unbanish", strlen (command)) == 0)) - strcpy (command, "unban"); - else if (strncmp (command, "unblock", 4) == 0 - && strncmp (command, "unblock", strlen (command)) == 0) - strcpy (command, "unblock"); - else if (strncmp (command, "version", 1) == 0 - && strncmp (command, "version", strlen (command)) == 0) - strcpy (command, "version"); - else if (strncmp (command, "who", 1) == 0 - && strncmp (command, "who", strlen (command)) == 0) - strcpy (command, "who"); + else if (strncmp(command, "state", 2) == 0 && strncmp(command, "state", strlen(command)) == 0) // not 1 letter command: 'search', 'state' or 'sex'? + strcpy(command, "state"); + else if ((strncmp(command, "timeadd", 5) == 0 && strncmp(command, "timeadd", strlen(command)) == 0) || // not 1 letter command: 'ta' or 'ts'? 'timeadd' or 'timeset'? + strcmp(command, "ta") == 0) + strcpy(command, "timeadd"); + else if ((strncmp(command, "timeset", 5) == 0 && strncmp(command, "timeset", strlen(command)) == 0) || // not 1 letter command: 'ta' or 'ts'? 'timeadd' or 'timeset'? + strcmp(command, "ts") == 0) + strcpy(command, "timeset"); + else if ((strncmp(command, "unban", 5) == 0 + && strncmp(command, "unban", strlen(command)) == 0) + ||(strncmp(command, "unbanish", 4) == 0 + && strncmp(command, "unbanish", strlen(command)) == 0)) + strcpy(command, "unban"); + else if (strncmp(command, "unblock", 4) == 0 + && strncmp(command, "unblock", strlen(command)) == 0) + strcpy(command, "unblock"); + else if (strncmp(command, "version", 1) == 0 + && strncmp(command, "version", strlen(command)) == 0) + strcpy(command, "version"); + else if (strncmp(command, "who", 1) == 0 + && strncmp(command, "who", strlen(command)) == 0) + strcpy(command, "who"); // quit - else if (strncmp (command, "quit", 1) == 0 - && strncmp (command, "quit", strlen (command)) == 0) - strcpy (command, "quit"); - else if (strncmp (command, "exit", 2) == 0 && strncmp (command, "exit", strlen (command)) == 0) // not 1 letter command: 'email', 'end' or 'exit'? - strcpy (command, "exit"); - else if (strncmp (command, "end", 2) == 0 && strncmp (command, "end", strlen (command)) == 0) // not 1 letter command: 'email', 'end' or 'exit'? - strcpy (command, "end"); + else if (strncmp(command, "quit", 1) == 0 + && strncmp(command, "quit", strlen(command)) == 0) + strcpy(command, "quit"); + else if (strncmp(command, "exit", 2) == 0 && strncmp(command, "exit", strlen(command)) == 0) // not 1 letter command: 'email', 'end' or 'exit'? + strcpy(command, "exit"); + else if (strncmp(command, "end", 2) == 0 && strncmp(command, "end", strlen(command)) == 0) // not 1 letter command: 'email', 'end' or 'exit'? + strcpy(command, "end"); return 0; } @@ -679,859 +512,342 @@ int check_command (char *command) // Sub-function: Display commands of ladmin //----------------------------------------- static -void display_help (const char *param, int language) +void display_help(const char *param) { char command[1023]; - int i; + int i; - memset (command, '\0', sizeof (command)); + memset(command, '\0', sizeof(command)); - if (sscanf (param, "%s ", command) < 1 || strlen (command) == 0) - strcpy (command, ""); // any value that is not a command + if (sscanf(param, "%s ", command) < 1 || strlen(command) == 0) + strcpy(command, ""); // any value that is not a command if (command[0] == '?') { - if (defaultlanguage == 'F') - strcpy (command, "aide"); - else - strcpy (command, "help"); + strcpy(command, "help"); } // lowercase for command for (i = 0; command[i]; i++) - command[i] = tolower (command[i]); + command[i] = tolower(command[i]); // Analyse of the command - check_command (command); // give complete name to the command + check_command(command); // give complete name to the command + + LADMIN_LOG("Displaying of the commands or a command.\n"); - if (defaultlanguage == 'F') + if (strcmp(command, "help") == 0) { - ladmin_log ("Affichage des commandes ou d'une commande.\n"); + PRINTF("help/?\n"); + PRINTF(" Display the description of the commands\n"); + PRINTF("help/? [command]\n"); + PRINTF(" Display the description of the specified command\n"); +// general commands } - else + else if (strcmp(command, "add") == 0) { - ladmin_log ("Displaying of the commands or a command.\n"); + PRINTF("add <account_name> <sex> <password>\n"); + PRINTF(" Create an account with the default email (a@a.com).\n"); + PRINTF(" Concerning the sex, only the first letter is used (F or M).\n"); + PRINTF(" The e-mail is set to a@a.com (default e-mail). It's like to have no e-mail.\n"); + PRINTF(" When the password is omitted,\n"); + PRINTF(" the input is done without displaying of the pressed keys.\n"); + PRINTF(" <example> add testname Male testpass\n"); } - - if (language == 1) + else if (strcmp(command, "ban") == 0) { - if (strcmp (command, "aide") == 0) - { - printf ("aide/help/?\n"); - printf (" Affiche la description des commandes\n"); - printf ("aide/help/? [commande]\n"); - printf (" Affiche la description de la commande specifiée\n"); - } - else if (strcmp (command, "help") == 0) - { - printf ("aide/help/?\n"); - printf (" Display the description of the commands\n"); - printf ("aide/help/? [command]\n"); - printf (" Display the description of the specified command\n"); -// general commands - } - else if (strcmp (command, "add") == 0) - { - printf ("add <nomcompte> <sexe> <motdepasse>\n"); - printf (" Crée un compte avec l'email par défaut (a@a.com).\n"); - printf - (" Concernant le sexe, seule la première lettre compte (F ou M).\n"); - printf - (" L'e-mail est a@a.com (e-mail par défaut). C'est comme n'avoir aucun e-mail.\n"); - printf - (" Lorsque motdepasse est omis, la saisie se fait sans que la frappe se voit.\n"); - printf (" <exemple> add testname Male testpass\n"); - } - else if (strcmp (command, "ban") == 0) - { - printf ("ban/banish aaaa/mm/jj hh:mm:ss <nom compte>\n"); - printf (" Change la date de fin de bannissement d'un compte.\n"); - printf (" Comme banset, mais <nom compte> est à la fin.\n"); - } - else if (strcmp (command, "banadd") == 0) - { - printf ("banadd <nomcompte> <Modificateur>\n"); - printf - (" Ajoute ou soustrait du temps à la date de banissement d'un compte.\n"); - printf (" Les modificateurs sont construits comme suit:\n"); - printf (" Valeur d'ajustement (-1, 1, +1, etc...)\n"); - printf (" Elément modifié:\n"); - printf (" a ou y: année\n"); - printf (" m: mois\n"); - printf (" j ou d: jour\n"); - printf (" h: heure\n"); - printf (" mn: minute\n"); - printf (" s: seconde\n"); - printf (" <exemple> banadd testname +1m-2mn1s-6a\n"); - printf - (" Cette exemple ajoute 1 mois et une seconde, et soustrait 2 minutes\n"); - printf (" et 6 ans dans le même temps.\n"); - printf - ("NOTE: Si vous modifez la date de banissement d'un compte non bani,\n"); - printf - (" vous indiquez comme date (le moment actuel +- les ajustements)\n"); - } - else if (strcmp (command, "banset") == 0) - { - printf ("banset <nomcompte> aaaa/mm/jj [hh:mm:ss]\n"); - printf (" Change la date de fin de bannissement d'un compte.\n"); - printf (" Heure par défaut [hh:mm:ss]: 23:59:59.\n"); - printf ("banset <nomcompte> 0\n"); - printf (" Débanni un compte (0 = de-banni).\n"); - } - else if (strcmp (command, "block") == 0) - { - printf ("block <nom compte>\n"); - printf - (" Place le status d'un compte à 5 (You have been blocked by the GM Team).\n"); - printf - (" La commande est l'équivalent de state <nom_compte> 5.\n"); - } - else if (strcmp (command, "check") == 0) - { - printf ("check <nomcompte> <motdepasse>\n"); - printf - (" Vérifie la validité d'un mot de passe pour un compte\n"); - printf (" NOTE: Le serveur n'enverra jamais un mot de passe.\n"); - printf - (" C'est la seule méthode que vous possédez pour savoir\n"); - printf - (" si un mot de passe est le bon. L'autre méthode est\n"); - printf - (" d'avoir un accès ('physique') au fichier des comptes.\n"); - } - else if (strcmp (command, "create") == 0) - { - printf ("create <nomcompte> <sexe> <email> <motdepasse>\n"); - printf (" Comme la commande add, mais avec l'e-mail en plus.\n"); - printf - (" <exemple> create testname Male mon@mail.com testpass\n"); - } - else if (strcmp (command, "delete") == 0) - { - printf ("del <nom compte>\n"); - printf (" Supprime un compte.\n"); - printf - (" La commande demande confirmation. Après confirmation, le compte est détruit.\n"); - } - else if (strcmp (command, "email") == 0) - { - printf ("email <nomcompte> <email>\n"); - printf (" Modifie l'e-mail d'un compte.\n"); - } - else if (strcmp (command, "getcount") == 0) - { - printf ("getcount\n"); - printf - (" Donne le nombre de joueurs en ligne par serveur de char.\n"); - } - else if (strcmp (command, "gm") == 0) - { - printf ("gm <nomcompte> [Niveau_GM]\n"); - printf (" Modifie le niveau de GM d'un compte.\n"); - printf - (" Valeur par défaut: 0 (suppression du niveau de GM).\n"); - printf (" <exemple> gm nomtest 80\n"); - } - else if (strcmp (command, "id") == 0) - { - printf ("id <nom compte>\n"); - printf (" Donne l'id d'un compte.\n"); - } - else if (strcmp (command, "info") == 0) - { - printf ("info <idcompte>\n"); - printf (" Affiche les informations sur un compte.\n"); - } - else if (strcmp (command, "kami") == 0) - { - printf ("kami <message>\n"); - printf - (" Envoi un message général sur tous les serveurs de map (en jaune).\n"); - } - else if (strcmp (command, "kamib") == 0) - { - printf ("kamib <message>\n"); - printf - (" Envoi un message général sur tous les serveurs de map (en bleu).\n"); - } - else if (strcmp (command, "language") == 0) - { - printf ("language <langue>\n"); - printf (" Change la langue d'affichage.\n"); - printf (" Langues possibles: 'Français' ou 'English'.\n"); - } - else if (strcmp (command, "list") == 0) - { - printf ("list/ls [Premier_id [Dernier_id]]\n"); - printf (" Affiche une liste de comptes.\n"); - printf - (" 'Premier_id', 'Dernier_id': indique les identifiants de départ et de fin.\n"); - printf - (" La recherche par nom n'est pas possible avec cette commande.\n"); - printf (" <example> list 10 9999999\n"); - } - else if (strcmp (command, "itemfrob") == 0) - { - printf ("Not localised yet.\n"); - } - else if (strcmp (command, "listban") == 0) - { - printf ("listBan/lsBan [Premier_id [Dernier_id]]\n"); - printf - (" Comme list/ls, mais seulement pour les comptes avec statut ou bannis.\n"); - } - else if (strcmp (command, "listgm") == 0) - { - printf ("listGM/lsGM [Premier_id [Dernier_id]]\n"); - printf (" Comme list/ls, mais seulement pour les comptes GM.\n"); - } - else if (strcmp (command, "listok") == 0) - { - printf ("listOK/lsOK [Premier_id [Dernier_id]]\n"); - printf - (" Comme list/ls, mais seulement pour les comptes sans statut et non bannis.\n"); - } - else if (strcmp (command, "memo") == 0) - { - printf ("memo <nomcompte> <memo>\n"); - printf (" Modifie le mémo d'un compte.\n"); - printf - (" 'memo': Il peut avoir jusqu'à 253 caractères (avec des espaces ou non).\n"); - } - else if (strcmp (command, "name") == 0) - { - printf ("name <idcompte>\n"); - printf (" Donne le nom d'un compte.\n"); - } - else if (strcmp (command, "password") == 0) - { - printf ("passwd <nomcompte> <nouveaumotdepasse>\n"); - printf (" Change le mot de passe d'un compte.\n"); - printf (" Lorsque nouveaumotdepasse est omis,\n"); - printf (" la saisie se fait sans que la frappe ne se voit.\n"); - } - else if (strcmp (command, "reloadgm") == 0) - { - printf ("reloadGM\n"); - printf (" Reload GM configuration file\n"); - } - else if (strcmp (command, "search") == 0) - { - printf ("search <expression>\n"); - printf (" Cherche des comptes.\n"); - printf (" Affiche les comptes dont les noms correspondent.\n"); -// printf("search -r/-e/--expr/--regex <expression>\n"); -// printf(" Cherche des comptes par expression regulière.\n"); -// printf(" Affiche les comptes dont les noms correspondent.\n"); - } - else if (strcmp (command, "sex") == 0) - { - printf ("sex <nomcompte> <sexe>\n"); - printf (" Modifie le sexe d'un compte.\n"); - printf (" <exemple> sex testname Male\n"); - } - else if (strcmp (command, "state") == 0) - { - printf ("state <nomcompte> <nouveaustatut> <message_erreur_7>\n"); - printf (" Change le statut d'un compte.\n"); - printf - (" 'nouveaustatut': Le statut est le même que celui du packet 0x006a + 1.\n"); - printf (" les possibilités sont:\n"); - printf (" 0 = Compte ok\n"); - printf (" 1 = Unregistered ID\n"); - printf (" 2 = Incorrect Password\n"); - printf (" 3 = This ID is expired\n"); - printf (" 4 = Rejected from Server\n"); - printf - (" 5 = You have been blocked by the GM Team\n"); - printf - (" 6 = Your Game's EXE file is not the latest version\n"); - printf - (" 7 = You are Prohibited to log in until...\n"); - printf - (" 8 = Server is jammed due to over populated\n"); - printf (" 9 = No MSG\n"); - printf (" 100 = This ID has been totally erased\n"); - printf - (" all other values are 'No MSG', then use state 9 please.\n"); - printf (" 'message_erreur_7': message du code erreur 6 =\n"); - printf - (" = Your are Prohibited to log in until... (packet 0x006a)\n"); - } - else if (strcmp (command, "timeadd") == 0) - { - printf ("timeadd <nomcompte> <modificateur>\n"); - printf - (" Ajoute/soustrait du temps à la limite de validité d'un compte.\n"); - printf (" Le modificateur est composé comme suit:\n"); - printf (" Valeur modificatrice (-1, 1, +1, etc...)\n"); - printf (" Elément modifié:\n"); - printf (" a ou y: année\n"); - printf (" m: mois\n"); - printf (" j ou d: jour\n"); - printf (" h: heure\n"); - printf (" mn: minute\n"); - printf (" s: seconde\n"); - printf (" <exemple> timeadd testname +1m-2mn1s-6a\n"); - printf - (" Cette exemple ajoute 1 mois et une seconde, et soustrait 2 minutes\n"); - printf (" et 6 ans dans le même temps.\n"); - printf - ("NOTE: Vous ne pouvez pas modifier une limite de validité illimitée. Si vous\n"); - printf - (" désirez le faire, c'est que vous voulez probablement créer un limite de\n"); - printf - (" validité limitée. Donc, en premier, fixé une limite de valitidé.\n"); - } - else if (strcmp (command, "timeadd") == 0) - { - printf ("timeset <nomcompte> aaaa/mm/jj [hh:mm:ss]\n"); - printf (" Change la limite de validité d'un compte.\n"); - printf (" Heure par défaut [hh:mm:ss]: 23:59:59.\n"); - printf ("timeset <nomcompte> 0\n"); - printf - (" Donne une limite de validité illimitée (0 = illimitée).\n"); - } - else if (strcmp (command, "unban") == 0) - { - printf ("unban/unbanish <nom compte>\n"); - printf (" Ote le banissement d'un compte.\n"); - printf - (" La commande est l'équivalent de banset <nom_compte> 0.\n"); - } - else if (strcmp (command, "unblock") == 0) - { - printf ("unblock <nom compte>\n"); - printf (" Place le status d'un compte à 0 (Compte ok).\n"); - printf - (" La commande est l'équivalent de state <nom_compte> 0.\n"); - } - else if (strcmp (command, "version") == 0) - { - printf ("version\n"); - printf (" Affiche la version du login-serveur.\n"); - } - else if (strcmp (command, "who") == 0) - { - printf ("who <nom compte>\n"); - printf (" Affiche les informations sur un compte.\n"); + PRINTF("ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); + PRINTF(" Changes the final date of a banishment of an account.\n"); + PRINTF(" Like banset, but <account name> is at end.\n"); + } + else if (strcmp(command, "banadd") == 0) + { + PRINTF("banadd <account_name> <modifier>\n"); + PRINTF(" Adds or substracts time from the final date of a banishment of an account.\n"); + PRINTF(" Modifier is done as follows:\n"); + PRINTF(" Adjustment value (-1, 1, +1, etc...)\n"); + PRINTF(" Modified element:\n"); + PRINTF(" a or y: year\n"); + PRINTF(" m: month\n"); + PRINTF(" j or d: day\n"); + PRINTF(" h: hour\n"); + PRINTF(" mn: minute\n"); + PRINTF(" s: second\n"); + PRINTF(" <example> banadd testname +1m-2mn1s-6y\n"); + PRINTF(" this example adds 1 month and 1 second, and substracts 2 minutes\n"); + PRINTF(" and 6 years at the same time.\n"); + PRINTF("NOTE: If you modify the final date of a non-banished account,\n"); + PRINTF(" you fix the final date to (actual time +- adjustments)\n"); + } + else if (strcmp(command, "banset") == 0) + { + PRINTF("banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); + PRINTF(" Changes the final date of a banishment of an account.\n"); + PRINTF(" Default time [hh:mm:ss]: 23:59:59.\n"); + PRINTF("banset <account_name> 0\n"); + PRINTF(" Set a non-banished account (0 = unbanished).\n"); + } + else if (strcmp(command, "block") == 0) + { + PRINTF("block <account name>\n"); + PRINTF(" Set state 5 (You have been blocked by the GM Team) to an account.\n"); + PRINTF(" This command works like state <account_name> 5.\n"); + } + else if (strcmp(command, "check") == 0) + { + PRINTF("check <account_name> <password>\n"); + PRINTF(" Check the validity of a password for an account.\n"); + PRINTF(" NOTE: Server will never sends back a password.\n"); + PRINTF(" It's the only method you have to know if a password is correct.\n"); + PRINTF(" The other method is to have a ('physical') access to the accounts file.\n"); + } + else if (strcmp(command, "create") == 0) + { + PRINTF("create <account_name> <sex> <email> <password>\n"); + PRINTF(" Like the 'add' command, but with e-mail moreover.\n"); + PRINTF(" <example> create testname Male my@mail.com testpass\n"); + } + else if (strcmp(command, "delete") == 0) + { + PRINTF("del <account name>\n"); + PRINTF(" Remove an account.\n"); + PRINTF(" This order requires confirmation. After confirmation, the account is deleted.\n"); + } + else if (strcmp(command, "email") == 0) + { + PRINTF("email <account_name> <email>\n"); + PRINTF(" Modify the e-mail of an account.\n"); + } + else if (strcmp(command, "getcount") == 0) + { + PRINTF("getcount\n"); + PRINTF(" Give the number of players online on all char-servers.\n"); + } + else if (strcmp(command, "gm") == 0) + { + PRINTF("gm <account_name> [GM_level]\n"); + PRINTF(" Modify the GM level of an account.\n"); + PRINTF(" Default value remove GM level (GM level = 0).\n"); + PRINTF(" <example> gm testname 80\n"); + } + else if (strcmp(command, "id") == 0) + { + PRINTF("id <account name>\n"); + PRINTF(" Give the id of an account.\n"); + } + else if (strcmp(command, "info") == 0) + { + PRINTF("info <account_id>\n"); + PRINTF(" Display complete information of an account.\n"); + } + else if (strcmp(command, "kami") == 0) + { + PRINTF("kami <message>\n"); + PRINTF(" Sends a broadcast message on all map-server (in yellow).\n"); + } + else if (strcmp(command, "kamib") == 0) + { + PRINTF("kamib <message>\n"); + PRINTF(" Sends a broadcast message on all map-server (in blue).\n"); + } + else if (strcmp(command, "list") == 0) + { + PRINTF("list/ls [start_id [end_id]]\n"); + PRINTF(" Display a list of accounts.\n"); + PRINTF(" 'start_id', 'end_id': indicate end and start identifiers.\n"); + PRINTF(" Research by name is not possible with this command.\n"); + PRINTF(" <example> list 10 9999999\n"); + } + else if (strcmp(command, "itemfrob") == 0) + { + PRINTF("itemfrob <source-id> <dest-id>\n"); + PRINTF(" Translates item IDs for all accounts.\n"); + PRINTF(" Any items matching the source item ID will be mapped to the dest-id.\n"); + PRINTF(" <example> itemfrob 500 700\n"); + } + else if (strcmp(command, "listban") == 0) + { + PRINTF("listBan/lsBan [start_id [end_id]]\n"); + PRINTF(" Like list/ls, but only for accounts with state or banished.\n"); + } + else if (strcmp(command, "listgm") == 0) + { + PRINTF("listGM/lsGM [start_id [end_id]]\n"); + PRINTF(" Like list/ls, but only for GM accounts.\n"); + } + else if (strcmp(command, "listok") == 0) + { + PRINTF("listOK/lsOK [start_id [end_id]]\n"); + PRINTF(" Like list/ls, but only for accounts without state and not banished.\n"); + } + else if (strcmp(command, "memo") == 0) + { + PRINTF("memo <account_name> <memo>\n"); + PRINTF(" Modify the memo of an account.\n"); + PRINTF(" 'memo': it can have until 253 characters (with spaces or not).\n"); + } + else if (strcmp(command, "name") == 0) + { + PRINTF("name <account_id>\n"); + PRINTF(" Give the name of an account.\n"); + } + else if (strcmp(command, "password") == 0) + { + PRINTF("passwd <account_name> <new_password>\n"); + PRINTF(" Change the password of an account.\n"); + PRINTF(" When new password is omitted,\n"); + PRINTF(" the input is done without displaying of the pressed keys.\n"); + } + else if (strcmp(command, "reloadgm") == 0) + { + PRINTF("reloadGM\n"); + PRINTF(" Reload GM configuration file\n"); + } + else if (strcmp(command, "search") == 0) + { + PRINTF("search <expression>\n"); + PRINTF(" Seek accounts.\n"); + PRINTF(" Displays the accounts whose names correspond.\n"); +// PRINTF("search -r/-e/--expr/--regex <expression>\n"); +// PRINTF(" Seek accounts by regular expression.\n"); +// PRINTF(" Displays the accounts whose names correspond.\n"); + } + else if (strcmp(command, "sex") == 0) + { + PRINTF("sex <account_name> <sex>\n"); + PRINTF(" Modify the sex of an account.\n"); + PRINTF(" <example> sex testname Male\n"); + } + else if (strcmp(command, "state") == 0) + { + PRINTF("state <account_name> <new_state> <error_message_#7>\n"); + PRINTF(" Change the state of an account.\n"); + PRINTF(" 'new_state': state is the state of the packet 0x006a + 1.\n"); + PRINTF(" The possibilities are:\n"); + PRINTF(" 0 = Account ok\n"); + PRINTF(" 1 = Unregistered ID\n"); + PRINTF(" 2 = Incorrect Password\n"); + PRINTF(" 3 = This ID is expired\n"); + PRINTF(" 4 = Rejected from Server\n"); + PRINTF(" 5 = You have been blocked by the GM Team\n"); + PRINTF(" 6 = Your Game's EXE file is not the latest version\n"); + PRINTF(" 7 = You are Prohibited to log in until...\n"); + PRINTF(" 8 = Server is jammed due to over populated\n"); + PRINTF(" 9 = No MSG\n"); + PRINTF(" 100 = This ID has been totally erased\n"); + PRINTF(" all other values are 'No MSG', then use state 9 please.\n"); + PRINTF(" 'error_message_#7': message of the code error 6\n"); + PRINTF(" = Your are Prohibited to log in until... (packet 0x006a)\n"); + } + else if (strcmp(command, "timeadd") == 0) + { + PRINTF("timeadd <account_name> <modifier>\n"); + PRINTF(" Adds or substracts time from the validity limit of an account.\n"); + PRINTF(" Modifier is done as follows:\n"); + PRINTF(" Adjustment value (-1, 1, +1, etc...)\n"); + PRINTF(" Modified element:\n"); + PRINTF(" a or y: year\n"); + PRINTF(" m: month\n"); + PRINTF(" j or d: day\n"); + PRINTF(" h: hour\n"); + PRINTF(" mn: minute\n"); + PRINTF(" s: second\n"); + PRINTF(" <example> timeadd testname +1m-2mn1s-6y\n"); + PRINTF(" this example adds 1 month and 1 second, and substracts 2 minutes\n"); + PRINTF(" and 6 years at the same time.\n"); + PRINTF("NOTE: You can not modify a unlimited validity limit.\n"); + PRINTF(" If you want modify it, you want probably create a limited validity limit.\n"); + PRINTF(" So, at first, you must set the validity limit to a date/time.\n"); + } + else if (strcmp(command, "timeadd") == 0) + { + PRINTF("timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); + PRINTF(" Changes the validity limit of an account.\n"); + PRINTF(" Default time [hh:mm:ss]: 23:59:59.\n"); + PRINTF("timeset <account_name> 0\n"); + PRINTF(" Gives an unlimited validity limit (0 = unlimited).\n"); + } + else if (strcmp(command, "unban") == 0) + { + PRINTF("unban/unbanish <account name>\n"); + PRINTF(" Remove the banishment of an account.\n"); + PRINTF(" This command works like banset <account_name> 0.\n"); + } + else if (strcmp(command, "unblock") == 0) + { + PRINTF("unblock <account name>\n"); + PRINTF(" Set state 0 (Account ok) to an account.\n"); + PRINTF(" This command works like state <account_name> 0.\n"); + } + else if (strcmp(command, "version") == 0) + { + PRINTF("version\n"); + PRINTF(" Display the version of the login-server.\n"); + } + else if (strcmp(command, "who") == 0) + { + PRINTF("who <account name>\n"); + PRINTF(" Displays complete information of an account.\n"); // quit - } - else if (strcmp (command, "quit") == 0 || - strcmp (command, "exit") == 0 || - strcmp (command, "end") == 0) - { - printf ("quit/end/exit\n"); - printf (" Fin du programme d'administration.\n"); + } + else if (strcmp(command, "quit") == 0 || + strcmp(command, "exit") == 0 || + strcmp(command, "end") == 0) + { + PRINTF("quit/end/exit\n"); + PRINTF(" End of the program of administration.\n"); // unknown command - } - else - { - if (strlen (command) > 0) - printf - ("Commande inconnue [%s] pour l'aide. Affichage de toutes les commandes.\n", - command); - printf - (" aide/help/? -- Affiche cet aide\n"); - printf - (" aide/help/? [commande] -- Affiche l'aide de la commande\n"); - printf - (" add <nomcompte> <sexe> <motdepasse> -- Crée un compte (sans email)\n"); - printf - (" ban/banish aaaa/mm/jj hh:mm:ss <nom compte> -- Fixe la date finale de banismnt\n"); - printf - (" banadd/ba <nomcompte> <modificateur> -- Ajout/soustrait du temps à la\n"); - printf - (" exemple: ba moncompte +1m-2mn1s-2y date finale de banissement\n"); - printf - (" banset/bs <nomcompte> aaaa/mm/jj [hh:mm:ss] -- Change la date fin de banisemnt\n"); - printf - (" banset/bs <nomcompte> 0 -- Dé-banis un compte.\n"); - printf - (" block <nom compte> -- Mets le status d'un compte à 5 (blocked by the GM Team)\n"); - printf - (" check <nomcompte> <motdepasse> -- Vérifie un mot de passe d'un compte\n"); - printf - (" create <nomcompte> <sexe> <email> <motdepasse> -- Crée un compte (avec email)\n"); - printf - (" del <nom compte> -- Supprime un compte\n"); - printf - (" email <nomcompte> <email> -- Modifie l'e-mail d'un compte\n"); - printf - (" getcount -- Donne le nb de joueurs en ligne\n"); - printf - (" gm <nomcompte> [Niveau_GM] -- Modifie le niveau de GM d'un compte\n"); - printf - (" id <nom compte> -- Donne l'id d'un compte\n"); - printf - (" info <idcompte> -- Affiche les infos sur un compte\n"); - printf - (" kami <message> -- Envoi un message général (en jaune)\n"); - printf - (" kamib <message> -- Envoi un message général (en bleu)\n"); - printf - (" language <langue> -- Change la langue d'affichage.\n"); - printf - (" list/ls [Premier_id [Dernier_id] ] -- Affiche une liste de comptes\n"); - printf - (" listBan/lsBan [Premier_id [Dernier_id] ] -- Affiche une liste de comptes\n"); - printf - (" avec un statut ou bannis\n"); - printf - (" listGM/lsGM [Premier_id [Dernier_id] ] -- Affiche une liste de comptes GM\n"); - printf - (" listOK/lsOK [Premier_id [Dernier_id] ] -- Affiche une liste de comptes\n"); - printf - (" sans status et non bannis\n"); - printf - (" memo <nomcompte> <memo> -- Modifie le memo d'un compte\n"); - printf - (" name <idcompte> -- Donne le nom d'un compte\n"); - printf - (" passwd <nomcompte> <nouveaumotdepasse> -- Change le mot de passe d'un compte\n"); - printf - (" quit/end/exit -- Fin du programme d'administation\n"); - printf - (" reloadGM -- Recharger le fichier de config des GM\n"); - printf - (" search <expression> -- Cherche des comptes\n"); -// printf(" search -e/-r/--expr/--regex <expression> -- Cherche des comptes par REGEX\n"); - printf - (" sex <nomcompte> <sexe> -- Modifie le sexe d'un compte\n"); - printf - (" state <nomcompte> <nouveaustatut> <messageerr7> -- Change le statut d'1 compte\n"); - printf - (" timeadd/ta <nomcompte> <modificateur> -- Ajout/soustrait du temps à la\n"); - printf - (" exemple: ta moncompte +1m-2mn1s-2y limite de validité\n"); - printf - (" timeset/ts <nomcompte> aaaa/mm/jj [hh:mm:ss] -- Change la limite de validité\n"); - printf - (" timeset/ts <nomcompte> 0 -- limite de validité = illimitée\n"); - printf - (" unban/unbanish <nom compte> -- Ote le banissement d'un compte\n"); - printf - (" unblock <nom compte> -- Mets le status d'un compte à 0 (Compte ok)\n"); - printf - (" version -- Donne la version du login-serveur\n"); - printf - (" who <nom compte> -- Affiche les infos sur un compte\n"); - printf - (" Note: Pour les noms de compte avec des espaces, tapez \"<nom compte>\" (ou ').\n"); - } } else { - if (strcmp (command, "aide") == 0) - { - printf ("aide/help/?\n"); - printf (" Display the description of the commands\n"); - printf ("aide/help/? [command]\n"); - printf (" Display the description of the specified command\n"); - } - else if (strcmp (command, "help") == 0) - { - printf ("aide/help/?\n"); - printf (" Display the description of the commands\n"); - printf ("aide/help/? [command]\n"); - printf (" Display the description of the specified command\n"); -// general commands - } - else if (strcmp (command, "add") == 0) - { - printf ("add <account_name> <sex> <password>\n"); - printf - (" Create an account with the default email (a@a.com).\n"); - printf - (" Concerning the sex, only the first letter is used (F or M).\n"); - printf - (" The e-mail is set to a@a.com (default e-mail). It's like to have no e-mail.\n"); - printf (" When the password is omitted,\n"); - printf - (" the input is done without displaying of the pressed keys.\n"); - printf (" <example> add testname Male testpass\n"); - } - else if (strcmp (command, "ban") == 0) - { - printf ("ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); - printf - (" Changes the final date of a banishment of an account.\n"); - printf (" Like banset, but <account name> is at end.\n"); - } - else if (strcmp (command, "banadd") == 0) - { - printf ("banadd <account_name> <modifier>\n"); - printf - (" Adds or substracts time from the final date of a banishment of an account.\n"); - printf (" Modifier is done as follows:\n"); - printf (" Adjustment value (-1, 1, +1, etc...)\n"); - printf (" Modified element:\n"); - printf (" a or y: year\n"); - printf (" m: month\n"); - printf (" j or d: day\n"); - printf (" h: hour\n"); - printf (" mn: minute\n"); - printf (" s: second\n"); - printf (" <example> banadd testname +1m-2mn1s-6y\n"); - printf - (" this example adds 1 month and 1 second, and substracts 2 minutes\n"); - printf (" and 6 years at the same time.\n"); - printf - ("NOTE: If you modify the final date of a non-banished account,\n"); - printf - (" you fix the final date to (actual time +- adjustments)\n"); - } - else if (strcmp (command, "banset") == 0) - { - printf ("banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); - printf - (" Changes the final date of a banishment of an account.\n"); - printf (" Default time [hh:mm:ss]: 23:59:59.\n"); - printf ("banset <account_name> 0\n"); - printf (" Set a non-banished account (0 = unbanished).\n"); - } - else if (strcmp (command, "block") == 0) - { - printf ("block <account name>\n"); - printf - (" Set state 5 (You have been blocked by the GM Team) to an account.\n"); - printf (" This command works like state <account_name> 5.\n"); - } - else if (strcmp (command, "check") == 0) - { - printf ("check <account_name> <password>\n"); - printf (" Check the validity of a password for an account.\n"); - printf (" NOTE: Server will never sends back a password.\n"); - printf - (" It's the only method you have to know if a password is correct.\n"); - printf - (" The other method is to have a ('physical') access to the accounts file.\n"); - } - else if (strcmp (command, "create") == 0) - { - printf ("create <account_name> <sex> <email> <password>\n"); - printf (" Like the 'add' command, but with e-mail moreover.\n"); - printf - (" <example> create testname Male my@mail.com testpass\n"); - } - else if (strcmp (command, "delete") == 0) - { - printf ("del <account name>\n"); - printf (" Remove an account.\n"); - printf - (" This order requires confirmation. After confirmation, the account is deleted.\n"); - } - else if (strcmp (command, "email") == 0) - { - printf ("email <account_name> <email>\n"); - printf (" Modify the e-mail of an account.\n"); - } - else if (strcmp (command, "getcount") == 0) - { - printf ("getcount\n"); - printf - (" Give the number of players online on all char-servers.\n"); - } - else if (strcmp (command, "gm") == 0) - { - printf ("gm <account_name> [GM_level]\n"); - printf (" Modify the GM level of an account.\n"); - printf (" Default value remove GM level (GM level = 0).\n"); - printf (" <example> gm testname 80\n"); - } - else if (strcmp (command, "id") == 0) - { - printf ("id <account name>\n"); - printf (" Give the id of an account.\n"); - } - else if (strcmp (command, "info") == 0) - { - printf ("info <account_id>\n"); - printf (" Display complete information of an account.\n"); - } - else if (strcmp (command, "kami") == 0) - { - printf ("kami <message>\n"); - printf - (" Sends a broadcast message on all map-server (in yellow).\n"); - } - else if (strcmp (command, "kamib") == 0) - { - printf ("kamib <message>\n"); - printf - (" Sends a broadcast message on all map-server (in blue).\n"); - } - else if (strcmp (command, "language") == 0) - { - printf ("language <language>\n"); - printf (" Change the language of displaying.\n"); - printf (" Possible languages: Français or English.\n"); - } - else if (strcmp (command, "list") == 0) - { - printf ("list/ls [start_id [end_id]]\n"); - printf (" Display a list of accounts.\n"); - printf - (" 'start_id', 'end_id': indicate end and start identifiers.\n"); - printf - (" Research by name is not possible with this command.\n"); - printf (" <example> list 10 9999999\n"); - } - else if (strcmp (command, "itemfrob") == 0) - { - printf ("itemfrob <source-id> <dest-id>\n"); - printf (" Translates item IDs for all accounts.\n"); - printf - (" Any items matching the source item ID will be mapped to the dest-id.\n"); - printf (" <example> itemfrob 500 700\n"); - } - else if (strcmp (command, "listban") == 0) - { - printf ("listBan/lsBan [start_id [end_id]]\n"); - printf - (" Like list/ls, but only for accounts with state or banished.\n"); - } - else if (strcmp (command, "listgm") == 0) - { - printf ("listGM/lsGM [start_id [end_id]]\n"); - printf (" Like list/ls, but only for GM accounts.\n"); - } - else if (strcmp (command, "listok") == 0) - { - printf ("listOK/lsOK [start_id [end_id]]\n"); - printf - (" Like list/ls, but only for accounts without state and not banished.\n"); - } - else if (strcmp (command, "memo") == 0) - { - printf ("memo <account_name> <memo>\n"); - printf (" Modify the memo of an account.\n"); - printf - (" 'memo': it can have until 253 characters (with spaces or not).\n"); - } - else if (strcmp (command, "name") == 0) - { - printf ("name <account_id>\n"); - printf (" Give the name of an account.\n"); - } - else if (strcmp (command, "password") == 0) - { - printf ("passwd <account_name> <new_password>\n"); - printf (" Change the password of an account.\n"); - printf (" When new password is omitted,\n"); - printf - (" the input is done without displaying of the pressed keys.\n"); - } - else if (strcmp (command, "reloadgm") == 0) - { - printf ("reloadGM\n"); - printf (" Reload GM configuration file\n"); - } - else if (strcmp (command, "search") == 0) - { - printf ("search <expression>\n"); - printf (" Seek accounts.\n"); - printf (" Displays the accounts whose names correspond.\n"); -// printf("search -r/-e/--expr/--regex <expression>\n"); -// printf(" Seek accounts by regular expression.\n"); -// printf(" Displays the accounts whose names correspond.\n"); - } - else if (strcmp (command, "sex") == 0) - { - printf ("sex <account_name> <sex>\n"); - printf (" Modify the sex of an account.\n"); - printf (" <example> sex testname Male\n"); - } - else if (strcmp (command, "state") == 0) - { - printf ("state <account_name> <new_state> <error_message_#7>\n"); - printf (" Change the state of an account.\n"); - printf - (" 'new_state': state is the state of the packet 0x006a + 1.\n"); - printf (" The possibilities are:\n"); - printf (" 0 = Account ok\n"); - printf (" 1 = Unregistered ID\n"); - printf (" 2 = Incorrect Password\n"); - printf (" 3 = This ID is expired\n"); - printf (" 4 = Rejected from Server\n"); - printf - (" 5 = You have been blocked by the GM Team\n"); - printf - (" 6 = Your Game's EXE file is not the latest version\n"); - printf - (" 7 = You are Prohibited to log in until...\n"); - printf - (" 8 = Server is jammed due to over populated\n"); - printf (" 9 = No MSG\n"); - printf (" 100 = This ID has been totally erased\n"); - printf - (" all other values are 'No MSG', then use state 9 please.\n"); - printf (" 'error_message_#7': message of the code error 6\n"); - printf - (" = Your are Prohibited to log in until... (packet 0x006a)\n"); - } - else if (strcmp (command, "timeadd") == 0) - { - printf ("timeadd <account_name> <modifier>\n"); - printf - (" Adds or substracts time from the validity limit of an account.\n"); - printf (" Modifier is done as follows:\n"); - printf (" Adjustment value (-1, 1, +1, etc...)\n"); - printf (" Modified element:\n"); - printf (" a or y: year\n"); - printf (" m: month\n"); - printf (" j or d: day\n"); - printf (" h: hour\n"); - printf (" mn: minute\n"); - printf (" s: second\n"); - printf (" <example> timeadd testname +1m-2mn1s-6y\n"); - printf - (" this example adds 1 month and 1 second, and substracts 2 minutes\n"); - printf (" and 6 years at the same time.\n"); - printf ("NOTE: You can not modify a unlimited validity limit.\n"); - printf - (" If you want modify it, you want probably create a limited validity limit.\n"); - printf - (" So, at first, you must set the validity limit to a date/time.\n"); - } - else if (strcmp (command, "timeadd") == 0) - { - printf ("timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); - printf (" Changes the validity limit of an account.\n"); - printf (" Default time [hh:mm:ss]: 23:59:59.\n"); - printf ("timeset <account_name> 0\n"); - printf (" Gives an unlimited validity limit (0 = unlimited).\n"); - } - else if (strcmp (command, "unban") == 0) - { - printf ("unban/unbanish <account name>\n"); - printf (" Remove the banishment of an account.\n"); - printf (" This command works like banset <account_name> 0.\n"); - } - else if (strcmp (command, "unblock") == 0) - { - printf ("unblock <account name>\n"); - printf (" Set state 0 (Account ok) to an account.\n"); - printf (" This command works like state <account_name> 0.\n"); - } - else if (strcmp (command, "version") == 0) - { - printf ("version\n"); - printf (" Display the version of the login-server.\n"); - } - else if (strcmp (command, "who") == 0) - { - printf ("who <account name>\n"); - printf (" Displays complete information of an account.\n"); -// quit - } - else if (strcmp (command, "quit") == 0 || - strcmp (command, "exit") == 0 || - strcmp (command, "end") == 0) - { - printf ("quit/end/exit\n"); - printf (" End of the program of administration.\n"); -// unknown command - } - else - { - if (strlen (command) > 0) - printf - ("Unknown command [%s] for help. Displaying of all commands.\n", - command); - printf - (" aide/help/? -- Display this help\n"); - printf - (" aide/help/? [command] -- Display the help of the command\n"); - printf - (" add <account_name> <sex> <password> -- Create an account with default email\n"); - printf - (" ban/banish yyyy/mm/dd hh:mm:ss <account name> -- Change final date of a ban\n"); - printf - (" banadd/ba <account_name> <modifier> -- Add or substract time from the final\n"); - printf - (" example: ba apple +1m-2mn1s-2y date of a banishment of an account\n"); - printf - (" banset/bs <account_name> yyyy/mm/dd [hh:mm:ss] -- Change final date of a ban\n"); - printf - (" banset/bs <account_name> 0 -- Un-banish an account\n"); - printf - (" block <account name> -- Set state 5 (blocked by the GM Team) to an account\n"); - printf - (" check <account_name> <password> -- Check the validity of a password\n"); - printf - (" create <account_name> <sex> <email> <passwrd> -- Create an account with email\n"); - printf - (" del <account name> -- Remove an account\n"); - printf - (" email <account_name> <email> -- Modify an email of an account\n"); - printf - (" getcount -- Give the number of players online\n"); - printf - (" gm <account_name> [GM_level] -- Modify the GM level of an account\n"); - printf - (" id <account name> -- Give the id of an account\n"); - printf - (" info <account_id> -- Display all information of an account\n"); - printf - (" itemfrob <source-id> <dest-id> -- Map all items from one item ID to another\n"); - printf - (" kami <message> -- Sends a broadcast message (in yellow)\n"); - printf - (" kamib <message> -- Sends a broadcast message (in blue)\n"); - printf - (" language <language> -- Change the language of displaying.\n"); - printf - (" list/ls [First_id [Last_id]] -- Display a list of accounts\n"); - printf - (" listBan/lsBan [First_id [Last_id] ] -- Display a list of accounts\n"); - printf - (" with state or banished\n"); - printf - (" listGM/lsGM [First_id [Last_id]] -- Display a list of GM accounts\n"); - printf - (" listOK/lsOK [First_id [Last_id] ] -- Display a list of accounts\n"); - printf - (" without state and not banished\n"); - printf - (" memo <account_name> <memo> -- Modify the memo of an account\n"); - printf - (" name <account_id> -- Give the name of an account\n"); - printf - (" passwd <account_name> <new_password> -- Change the password of an account\n"); - printf - (" quit/end/exit -- End of the program of administation\n"); - printf - (" reloadGM -- Reload GM configuration file\n"); - printf - (" search <expression> -- Seek accounts\n"); -// printf(" search -e/-r/--expr/--regex <expressn> -- Seek accounts by regular-expression\n"); - printf - (" sex <nomcompte> <sexe> -- Modify the sex of an account\n"); - printf - (" state <account_name> <new_state> <error_message_#7> -- Change the state\n"); - printf - (" timeadd/ta <account_name> <modifier> -- Add or substract time from the\n"); - printf - (" example: ta apple +1m-2mn1s-2y validity limit of an account\n"); - printf - (" timeset/ts <account_name> yyyy/mm/dd [hh:mm:ss] -- Change the validify limit\n"); - printf - (" timeset/ts <account_name> 0 -- Give a unlimited validity limit\n"); - printf - (" unban/unbanish <account name> -- Remove the banishment of an account\n"); - printf - (" unblock <account name> -- Set state 0 (Account ok) to an account\n"); - printf - (" version -- Gives the version of the login-server\n"); - printf - (" who <account name> -- Display all information of an account\n"); - printf - (" who <account name> -- Display all information of an account\n"); - printf - (" Note: To use spaces in an account name, type \"<account name>\" (or ').\n"); - } + if (strlen(command) > 0) + PRINTF("Unknown command [%s] for help. Displaying of all commands.\n", + command); + PRINTF(" help/? -- Display this help\n"); + PRINTF(" help/? [command] -- Display the help of the command\n"); + PRINTF(" add <account_name> <sex> <password> -- Create an account with default email\n"); + PRINTF(" ban/banish yyyy/mm/dd hh:mm:ss <account name> -- Change final date of a ban\n"); + PRINTF(" banadd/ba <account_name> <modifier> -- Add or substract time from the final\n"); + PRINTF(" example: ba apple +1m-2mn1s-2y date of a banishment of an account\n"); + PRINTF(" banset/bs <account_name> yyyy/mm/dd [hh:mm:ss] -- Change final date of a ban\n"); + PRINTF(" banset/bs <account_name> 0 -- Un-banish an account\n"); + PRINTF(" block <account name> -- Set state 5 (blocked by the GM Team) to an account\n"); + PRINTF(" check <account_name> <password> -- Check the validity of a password\n"); + PRINTF(" create <account_name> <sex> <email> <passwrd> -- Create an account with email\n"); + PRINTF(" del <account name> -- Remove an account\n"); + PRINTF(" email <account_name> <email> -- Modify an email of an account\n"); + PRINTF(" getcount -- Give the number of players online\n"); + PRINTF(" gm <account_name> [GM_level] -- Modify the GM level of an account\n"); + PRINTF(" id <account name> -- Give the id of an account\n"); + PRINTF(" info <account_id> -- Display all information of an account\n"); + PRINTF(" itemfrob <source-id> <dest-id> -- Map all items from one item ID to another\n"); + PRINTF(" kami <message> -- Sends a broadcast message (in yellow)\n"); + PRINTF(" kamib <message> -- Sends a broadcast message (in blue)\n"); + PRINTF(" list/ls [First_id [Last_id]] -- Display a list of accounts\n"); + PRINTF(" listBan/lsBan [First_id [Last_id] ] -- Display a list of accounts\n"); + PRINTF(" with state or banished\n"); + PRINTF(" listGM/lsGM [First_id [Last_id]] -- Display a list of GM accounts\n"); + PRINTF(" listOK/lsOK [First_id [Last_id] ] -- Display a list of accounts\n"); + PRINTF(" without state and not banished\n"); + PRINTF(" memo <account_name> <memo> -- Modify the memo of an account\n"); + PRINTF(" name <account_id> -- Give the name of an account\n"); + PRINTF(" passwd <account_name> <new_password> -- Change the password of an account\n"); + PRINTF(" quit/end/exit -- End of the program of administation\n"); + PRINTF(" reloadGM -- Reload GM configuration file\n"); + PRINTF(" search <expression> -- Seek accounts\n"); +// PRINTF(" search -e/-r/--expr/--regex <expressn> -- Seek accounts by regular-expression\n"); + PRINTF(" sex <nomcompte> <sexe> -- Modify the sex of an account\n"); + PRINTF(" state <account_name> <new_state> <error_message_#7> -- Change the state\n"); + PRINTF(" timeadd/ta <account_name> <modifier> -- Add or substract time from the\n"); + PRINTF(" example: ta apple +1m-2mn1s-2y validity limit of an account\n"); + PRINTF(" timeset/ts <account_name> yyyy/mm/dd [hh:mm:ss] -- Change the validify limit\n"); + PRINTF(" timeset/ts <account_name> 0 -- Give a unlimited validity limit\n"); + PRINTF(" unban/unbanish <account name> -- Remove the banishment of an account\n"); + PRINTF(" unblock <account name> -- Set state 0 (Account ok) to an account\n"); + PRINTF(" version -- Gives the version of the login-server\n"); + PRINTF(" who <account name> -- Display all information of an account\n"); + PRINTF(" who <account name> -- Display all information of an account\n"); + PRINTF(" Note: To use spaces in an account name, type \"<account name>\" (or ').\n"); } } @@ -1539,191 +855,97 @@ void display_help (const char *param, int language) // Sub-function: add an account //----------------------------- static -int addaccount (const char *param, int emailflag) +int addaccount(const char *param, int emailflag) { char name[1023], sex[1023], email[1023], password[1023]; // int i; - memset (name, '\0', sizeof (name)); - memset (sex, '\0', sizeof (sex)); - memset (email, '\0', sizeof (email)); - memset (password, '\0', sizeof (password)); + memset(name, '\0', sizeof(name)); + memset(sex, '\0', sizeof(sex)); + memset(email, '\0', sizeof(email)); + memset(password, '\0', sizeof(password)); if (emailflag == 0) { // add command - if (sscanf (param, "\"%[^\"]\" %s %[^\r\n]", name, sex, password) < 2 && // password can be void - sscanf (param, "'%[^']' %s %[^\r\n]", name, sex, password) < 2 && // password can be void - sscanf (param, "%s %s %[^\r\n]", name, sex, password) < 2) + if (sscanf(param, "\"%[^\"]\" %s %[^\r\n]", name, sex, password) < 2 && // password can be void + sscanf(param, "'%[^']' %s %[^\r\n]", name, sex, password) < 2 && // password can be void + sscanf(param, "%s %s %[^\r\n]", name, sex, password) < 2) { // password can be void - if (defaultlanguage == 'F') - { - printf - ("Entrez un nom de compte, un sexe et un mot de passe svp.\n"); - printf ("<exemple> add nomtest Male motdepassetest\n"); - ladmin_log - ("Nombre incorrect de paramètres pour créer un compte (commande 'add').\n"); - } - else - { - printf - ("Please input an account name, a sex and a password.\n"); - printf ("<example> add testname Male testpass\n"); - ladmin_log - ("Incomplete parameters to create an account ('add' command).\n"); - } + PRINTF("Please input an account name, a sex and a password.\n"); + PRINTF("<example> add testname Male testpass\n"); + LADMIN_LOG("Incomplete parameters to create an account ('add' command).\n"); return 136; } - strcpy (email, "a@a.com"); // default email + strcpy(email, "a@a.com"); // default email } else { // 1: create command - if (sscanf (param, "\"%[^\"]\" %s %s %[^\r\n]", name, sex, email, password) < 3 && // password can be void - sscanf (param, "'%[^']' %s %s %[^\r\n]", name, sex, email, password) < 3 && // password can be void - sscanf (param, "%s %s %s %[^\r\n]", name, sex, email, + if (sscanf(param, "\"%[^\"]\" %s %s %[^\r\n]", name, sex, email, password) < 3 && // password can be void + sscanf(param, "'%[^']' %s %s %[^\r\n]", name, sex, email, password) < 3 && // password can be void + sscanf(param, "%s %s %s %[^\r\n]", name, sex, email, password) < 3) { // password can be void - if (defaultlanguage == 'F') - { - printf - ("Entrez un nom de compte, un sexe et un mot de passe svp.\n"); - printf - ("<exemple> create nomtest Male mo@mail.com motdepassetest\n"); - ladmin_log - ("Nombre incorrect de paramètres pour créer un compte (commande 'create').\n"); - } - else - { - printf - ("Please input an account name, a sex and a password.\n"); - printf - ("<example> create testname Male my@mail.com testpass\n"); - ladmin_log - ("Incomplete parameters to create an account ('create' command).\n"); - } + PRINTF("Please input an account name, a sex and a password.\n"); + PRINTF("<example> create testname Male my@mail.com testpass\n"); + LADMIN_LOG("Incomplete parameters to create an account ('create' command).\n"); return 136; } } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } -/* for(i = 0; name[i]; i++) { - if (strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_", name[i]) == NULL) { - if (defaultlanguage == 'F') { - printf("Caractère interdit (%c) trouvé dans le nom du compte (%d%s caractère).\n", name[i], i+1, makeordinal(i+1)); - ladmin_log("Caractère interdit (%c) trouvé dans le nom du compte (%d%s caractère).\n", name[i], i+1, makeordinal(i+1)); - } else { - printf("Illegal character (%c) found in the account name (%d%s character).\n", name[i], i+1, makeordinal(i+1)); - ladmin_log("Illegal character (%c) found in the account name (%d%s character).\n", name[i], i+1, makeordinal(i+1)); - } - return 101; - } - }*/ - - sex[0] = toupper (sex[0]); - if (strchr ("MF", sex[0]) == NULL) + sex[0] = toupper(sex[0]); + if (strchr("MF", sex[0]) == NULL) { - if (defaultlanguage == 'F') - { - printf ("Sexe incorrect [%s]. Entrez M ou F svp.\n", sex); - ladmin_log ("Sexe incorrect [%s]. Entrez M ou F svp.\n", - sex); - } - else - { - printf ("Illegal gender [%s]. Please input M or F.\n", sex); - ladmin_log ("Illegal gender [%s]. Please input M or F.\n", - sex); - } + PRINTF("Illegal gender [%s]. Please input M or F.\n", sex); + LADMIN_LOG("Illegal gender [%s]. Please input M or F.\n", + sex); return 103; } - if (strlen (email) < 3) + if (strlen(email) < 3) { - if (defaultlanguage == 'F') - { - printf ("Email trop courte [%s]. Entrez une e-mail valide svp.\n", - email); - ladmin_log - ("Email trop courte [%s]. Entrez une e-mail valide svp.\n", - email); - } - else - { - printf ("Email is too short [%s]. Please input a valid e-mail.\n", - email); - ladmin_log - ("Email is too short [%s]. Please input a valid e-mail.\n", - email); - } + PRINTF("Email is too short [%s]. Please input a valid e-mail.\n", + email); + LADMIN_LOG("Email is too short [%s]. Please input a valid e-mail.\n", + email); return 109; } - if (strlen (email) > 39) + if (strlen(email) > 39) { - if (defaultlanguage == 'F') - { - printf - ("Email trop longue [%s]. Entrez une e-mail de 39 caractères maximum svp.\n", - email); - ladmin_log - ("Email trop longue [%s]. Entrez une e-mail de 39 caractères maximum svp.\n", - email); - } - else - { - printf - ("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", - email); - ladmin_log - ("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", - email); - } + PRINTF("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", + email); + LADMIN_LOG("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", + email); return 109; } - if (e_mail_check (email) == 0) + if (e_mail_check(email) == 0) { - if (defaultlanguage == 'F') - { - printf ("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", - email); - ladmin_log ("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", - email); - } - else - { - printf ("Invalid email [%s]. Please input a valid e-mail.\n", - email); - ladmin_log ("Invalid email [%s]. Please input a valid e-mail.\n", - email); - } + PRINTF("Invalid email [%s]. Please input a valid e-mail.\n", + email); + LADMIN_LOG("Invalid email [%s]. Please input a valid e-mail.\n", + email); return 109; } - if (strlen (password) == 0) + if (strlen(password) == 0) { - if (typepasswd (password) == 0) + if (typepasswd(password) == 0) return 108; } - if (verify_password (password) == 0) + if (verify_password(password) == 0) return 104; - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour créer un compte.\n"); - } - else - { - ladmin_log ("Request to login-server to create an account.\n"); - } + LADMIN_LOG("Request to login-server to create an account.\n"); - WFIFOW (login_fd, 0) = 0x7930; - memcpy (WFIFOP (login_fd, 2), name, 24); - memcpy (WFIFOP (login_fd, 26), password, 24); - WFIFOB (login_fd, 50) = sex[0]; - memcpy (WFIFOP (login_fd, 51), email, 40); - WFIFOSET (login_fd, 91); + WFIFOW(login_fd, 0) = 0x7930; + memcpy(WFIFOP(login_fd, 2), name, 24); + memcpy(WFIFOP(login_fd, 26), password, 24); + WFIFOB(login_fd, 50) = sex[0]; + memcpy(WFIFOP(login_fd, 51), email, 40); + WFIFOSET(login_fd, 91); bytes_to_read = 1; return 0; @@ -1733,55 +955,40 @@ int addaccount (const char *param, int emailflag) // Sub-function: Add/substract time to the final date of a banishment of an account //--------------------------------------------------------------------------------- static -int banaddaccount (const char *param) +int banaddaccount(const char *param) { char name[1023], modif[1023]; - int year, month, day, hour, minute, second; + int year, month, day, hour, minute, second; const char *p_modif; - int value, i; + int value, i; - memset (name, '\0', sizeof (name)); - memset (modif, '\0', sizeof (modif)); + memset(name, '\0', sizeof(name)); + memset(modif, '\0', sizeof(modif)); year = month = day = hour = minute = second = 0; - if (sscanf (param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 && - sscanf (param, "'%[^']' %[^\r\n]", name, modif) < 2 && - sscanf (param, "%s %[^\r\n]", name, modif) < 2) + if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 && + sscanf(param, "'%[^']' %[^\r\n]", name, modif) < 2 && + sscanf(param, "%s %[^\r\n]", name, modif) < 2) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte et un modificateur svp.\n"); - printf (" <exemple> banadd nomtest +1m-2mn1s-6y\n"); - printf - (" Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n"); - printf (" et 6 ans dans le même temps.\n"); - ladmin_log - ("Nombre incorrect de paramètres pour modifier la fin de ban d'un compte (commande 'banadd').\n"); - } - else - { - printf ("Please input an account name and a modifier.\n"); - printf (" <example>: banadd testname +1m-2mn1s-6y\n"); - printf - (" this example adds 1 month and 1 second, and substracts 2 minutes\n"); - printf (" and 6 years at the same time.\n"); - ladmin_log - ("Incomplete parameters to modify the ban date/time of an account ('banadd' command).\n"); - } + PRINTF("Please input an account name and a modifier.\n"); + PRINTF(" <example>: banadd testname +1m-2mn1s-6y\n"); + PRINTF(" this example adds 1 month and 1 second, and substracts 2 minutes\n"); + PRINTF(" and 6 years at the same time.\n"); + LADMIN_LOG("Incomplete parameters to modify the ban date/time of an account ('banadd' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } // lowercase for modif for (i = 0; modif[i]; i++) - modif[i] = tolower (modif[i]); + modif[i] = tolower(modif[i]); p_modif = modif; - while (strlen (p_modif) > 0) + while (strlen(p_modif) > 0) { - value = atoi (p_modif); + value = atoi(p_modif); if (value == 0) { p_modif++; @@ -1790,7 +997,7 @@ int banaddaccount (const char *param) { if (p_modif[0] == '-' || p_modif[0] == '+') p_modif++; - while (strlen (p_modif) > 0 && p_modif[0] >= '0' + while (strlen(p_modif) > 0 && p_modif[0] >= '0' && p_modif[0] <= '9') { p_modif++; @@ -1832,193 +1039,79 @@ int banaddaccount (const char *param) } } - if (defaultlanguage == 'F') - { - printf (" année: %d\n", year); - printf (" mois: %d\n", month); - printf (" jour: %d\n", day); - printf (" heure: %d\n", hour); - printf (" minute: %d\n", minute); - printf (" seconde: %d\n", second); - } - else - { - printf (" year: %d\n", year); - printf (" month: %d\n", month); - printf (" day: %d\n", day); - printf (" hour: %d\n", hour); - printf (" minute: %d\n", minute); - printf (" second: %d\n", second); - } + PRINTF(" year: %d\n", year); + PRINTF(" month: %d\n", month); + PRINTF(" day: %d\n", day); + PRINTF(" hour: %d\n", hour); + PRINTF(" minute: %d\n", minute); + PRINTF(" second: %d\n", second); if (year == 0 && month == 0 && day == 0 && hour == 0 && minute == 0 && second == 0) { - if (defaultlanguage == 'F') - { - printf - ("Vous devez entrer un ajustement avec cette commande, svp:\n"); - printf (" Valeur d'ajustement (-1, 1, +1, etc...)\n"); - printf (" Element modifié:\n"); - printf (" a ou y: année\n"); - printf (" m: mois\n"); - printf (" j ou d: jour\n"); - printf (" h: heure\n"); - printf (" mn: minute\n"); - printf (" s: seconde\n"); - printf (" <exemple> banadd nomtest +1m-2mn1s-6y\n"); - printf - (" Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n"); - printf (" et 6 ans dans le même temps.\n"); - ladmin_log - ("Aucun ajustement n'est pas un ajustement (commande 'banadd').\n"); - } - else - { - printf ("Please give an adjustment with this command:\n"); - printf (" Adjustment value (-1, 1, +1, etc...)\n"); - printf (" Modified element:\n"); - printf (" a or y: year\n"); - printf (" m: month\n"); - printf (" j or d: day\n"); - printf (" h: hour\n"); - printf (" mn: minute\n"); - printf (" s: second\n"); - printf (" <example> banadd testname +1m-2mn1s-6y\n"); - printf - (" this example adds 1 month and 1 second, and substracts 2 minutes\n"); - printf (" and 6 years at the same time.\n"); - ladmin_log - ("No adjustment isn't an adjustment ('banadd' command).\n"); - } + PRINTF("Please give an adjustment with this command:\n"); + PRINTF(" Adjustment value (-1, 1, +1, etc...)\n"); + PRINTF(" Modified element:\n"); + PRINTF(" a or y: year\n"); + PRINTF(" m: month\n"); + PRINTF(" j or d: day\n"); + PRINTF(" h: hour\n"); + PRINTF(" mn: minute\n"); + PRINTF(" s: second\n"); + PRINTF(" <example> banadd testname +1m-2mn1s-6y\n"); + PRINTF(" this example adds 1 month and 1 second, and substracts 2 minutes\n"); + PRINTF(" and 6 years at the same time.\n"); + LADMIN_LOG("No adjustment isn't an adjustment ('banadd' command).\n"); return 137; } if (year > 127 || year < -127) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement d'années correct (de -127 à 127), svp.\n"); - ladmin_log - ("Ajustement de l'année hors norme (commande 'banadd').\n"); - } - else - { - printf - ("Please give a correct adjustment for the years (from -127 to 127).\n"); - ladmin_log - ("Abnormal adjustement for the year ('banadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the years (from -127 to 127).\n"); + LADMIN_LOG("Abnormal adjustement for the year ('banadd' command).\n"); return 137; } if (month > 255 || month < -255) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de mois correct (de -255 à 255), svp.\n"); - ladmin_log ("Ajustement du mois hors norme (commande 'banadd').\n"); - } - else - { - printf - ("Please give a correct adjustment for the months (from -255 to 255).\n"); - ladmin_log - ("Abnormal adjustement for the month ('banadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the months (from -255 to 255).\n"); + LADMIN_LOG("Abnormal adjustement for the month ('banadd' command).\n"); return 137; } if (day > 32767 || day < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de jours correct (de -32767 à 32767), svp.\n"); - ladmin_log ("Ajustement des jours hors norme (commande 'banadd').\n"); - } - else - { - printf - ("Please give a correct adjustment for the days (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the days ('banadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the days (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the days ('banadd' command).\n"); return 137; } if (hour > 32767 || hour < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement d'heures correct (de -32767 à 32767), svp.\n"); - ladmin_log - ("Ajustement des heures hors norme (commande 'banadd').\n"); - } - else - { - printf - ("Please give a correct adjustment for the hours (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the hours ('banadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the hours (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the hours ('banadd' command).\n"); return 137; } if (minute > 32767 || minute < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de minutes correct (de -32767 à 32767), svp.\n"); - ladmin_log - ("Ajustement des minutes hors norme (commande 'banadd').\n"); - } - else - { - printf - ("Please give a correct adjustment for the minutes (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the minutes ('banadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the minutes (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the minutes ('banadd' command).\n"); return 137; } if (second > 32767 || second < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de secondes correct (de -32767 à 32767), svp.\n"); - ladmin_log - ("Ajustement des secondes hors norme (commande 'banadd').\n"); - } - else - { - printf - ("Please give a correct adjustment for the seconds (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the seconds ('banadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the seconds (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the seconds ('banadd' command).\n"); return 137; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour modifier la date d'un bannissement.\n"); - } - else - { - ladmin_log ("Request to login-server to modify a ban date/time.\n"); - } - - WFIFOW (login_fd, 0) = 0x794c; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOW (login_fd, 26) = (short) year; - WFIFOW (login_fd, 28) = (short) month; - WFIFOW (login_fd, 30) = (short) day; - WFIFOW (login_fd, 32) = (short) hour; - WFIFOW (login_fd, 34) = (short) minute; - WFIFOW (login_fd, 36) = (short) second; - WFIFOSET (login_fd, 38); + LADMIN_LOG("Request to login-server to modify a ban date/time.\n"); + + WFIFOW(login_fd, 0) = 0x794c; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOW(login_fd, 26) = (short) year; + WFIFOW(login_fd, 28) = (short) month; + WFIFOW(login_fd, 30) = (short) day; + WFIFOW(login_fd, 32) = (short) hour; + WFIFOW(login_fd, 34) = (short) minute; + WFIFOW(login_fd, 36) = (short) second; + WFIFOSET(login_fd, 38); bytes_to_read = 1; return 0; @@ -2029,51 +1122,35 @@ int banaddaccount (const char *param) // Set the final date of a banishment of an account //----------------------------------------------------------------------- static -int bansetaccountsub (const char *name, const char *date, const char *time) +int bansetaccountsub(const char *name, const char *date, const char *time_) { - int year, month, day, hour, minute, second; - time_t ban_until_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban) - struct tm *tmtime; - + int year, month, day, hour, minute, second; year = month = day = hour = minute = second = 0; - ban_until_time = 0; - tmtime = localtime (&ban_until_time); // initialize - if (verify_accountname (name) == 0) + // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban) + TimeT ban_until_time = TimeT(); + struct tm tmtime = ban_until_time; // initialize + + if (verify_accountname(name) == 0) { return 102; } - if (atoi (date) != 0 && - ((sscanf (date, "%d/%d/%d", &year, &month, &day) < 3 && - sscanf (date, "%d-%d-%d", &year, &month, &day) < 3 && - sscanf (date, "%d.%d.%d", &year, &month, &day) < 3) || - sscanf (time, "%d:%d:%d", &hour, &minute, &second) < 3)) + if (atoi(date) != 0 && + ((sscanf(date, "%d/%d/%d", &year, &month, &day) < 3 && + sscanf(date, "%d-%d-%d", &year, &month, &day) < 3 && + sscanf(date, "%d.%d.%d", &year, &month, &day) < 3) || + sscanf(time_, "%d:%d:%d", &hour, &minute, &second) < 3)) { - if (defaultlanguage == 'F') - { - printf - ("Entrez une date et une heure svp (format: aaaa/mm/jj hh:mm:ss).\n"); - printf - ("Vous pouvez aussi mettre 0 à la place si vous utilisez la commande 'banset'.\n"); - ladmin_log - ("Format incorrect pour la date/heure (commande'banset' ou 'ban').\n"); - } - else - { - printf - ("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n"); - printf - ("You can imput 0 instead of if you use 'banset' command.\n"); - ladmin_log - ("Invalid format for the date/time ('banset' or 'ban' command).\n"); - } + PRINTF("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n"); + PRINTF("You can imput 0 instead of if you use 'banset' command.\n"); + LADMIN_LOG("Invalid format for the date/time ('banset' or 'ban' command).\n"); return 102; } - if (atoi (date) == 0) + if (atoi(date) == 0) { - ban_until_time = 0; + ban_until_time = TimeT(); } else { @@ -2087,159 +1164,67 @@ int bansetaccountsub (const char *name, const char *date, const char *time) } if (month < 1 || month > 12) { - if (defaultlanguage == 'F') - { - printf ("Entrez un mois correct svp (entre 1 et 12).\n"); - ladmin_log - ("Mois incorrect pour la date (command 'banset' ou 'ban').\n"); - } - else - { - printf - ("Please give a correct value for the month (from 1 to 12).\n"); - ladmin_log - ("Invalid month for the date ('banset' or 'ban' command).\n"); - } + PRINTF("Please give a correct value for the month (from 1 to 12).\n"); + LADMIN_LOG("Invalid month for the date ('banset' or 'ban' command).\n"); return 102; } month = month - 1; if (day < 1 || day > 31) { - if (defaultlanguage == 'F') - { - printf ("Entrez un jour correct svp (entre 1 et 31).\n"); - ladmin_log - ("Jour incorrect pour la date (command 'banset' ou 'ban').\n"); - } - else - { - printf - ("Please give a correct value for the day (from 1 to 31).\n"); - ladmin_log - ("Invalid day for the date ('banset' or 'ban' command).\n"); - } + PRINTF("Please give a correct value for the day (from 1 to 31).\n"); + LADMIN_LOG("Invalid day for the date ('banset' or 'ban' command).\n"); return 102; } if (((month == 3 || month == 5 || month == 8 || month == 10) - && day > 30) || (month == 1 && day > 29)) + && day > 30) ||(month == 1 && day > 29)) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un jour correct en fonction du mois (%d) svp.\n", - month); - ladmin_log - ("Jour incorrect pour ce mois correspondant (command 'banset' ou 'ban').\n"); - } - else - { - printf - ("Please give a correct value for a day of this month (%d).\n", - month); - ladmin_log - ("Invalid day for this month ('banset' or 'ban' command).\n"); - } + PRINTF("Please give a correct value for a day of this month (%d).\n", + month); + LADMIN_LOG("Invalid day for this month ('banset' or 'ban' command).\n"); return 102; } if (hour < 0 || hour > 23) { - if (defaultlanguage == 'F') - { - printf ("Entrez une heure correcte svp (entre 0 et 23).\n"); - ladmin_log - ("Heure incorrecte pour l'heure (command 'banset' ou 'ban').\n"); - } - else - { - printf - ("Please give a correct value for the hour (from 0 to 23).\n"); - ladmin_log - ("Invalid hour for the time ('banset' or 'ban' command).\n"); - } + PRINTF("Please give a correct value for the hour (from 0 to 23).\n"); + LADMIN_LOG("Invalid hour for the time ('banset' or 'ban' command).\n"); return 102; } if (minute < 0 || minute > 59) { - if (defaultlanguage == 'F') - { - printf - ("Entrez des minutes correctes svp (entre 0 et 59).\n"); - ladmin_log - ("Minute incorrecte pour l'heure (command 'banset' ou 'ban').\n"); - } - else - { - printf - ("Please give a correct value for the minutes (from 0 to 59).\n"); - ladmin_log - ("Invalid minute for the time ('banset' or 'ban' command).\n"); - } + PRINTF("Please give a correct value for the minutes (from 0 to 59).\n"); + LADMIN_LOG("Invalid minute for the time ('banset' or 'ban' command).\n"); return 102; } if (second < 0 || second > 59) { - if (defaultlanguage == 'F') - { - printf - ("Entrez des secondes correctes svp (entre 0 et 59).\n"); - ladmin_log - ("Seconde incorrecte pour l'heure (command 'banset' ou 'ban').\n"); - } - else - { - printf - ("Please give a correct value for the seconds (from 0 to 59).\n"); - ladmin_log - ("Invalid second for the time ('banset' or 'ban' command).\n"); - } + PRINTF("Please give a correct value for the seconds (from 0 to 59).\n"); + LADMIN_LOG("Invalid second for the time ('banset' or 'ban' command).\n"); return 102; } - tmtime->tm_year = year; - tmtime->tm_mon = month; - tmtime->tm_mday = day; - tmtime->tm_hour = hour; - tmtime->tm_min = minute; - tmtime->tm_sec = second; - tmtime->tm_isdst = -1; // -1: no winter/summer time modification - ban_until_time = timegm (tmtime); - if (ban_until_time == -1) - { - if (defaultlanguage == 'F') - { - printf ("Date incorrecte.\n"); - printf - ("Entrez une date et une heure svp (format: aaaa/mm/jj hh:mm:ss).\n"); - printf - ("Vous pouvez aussi mettre 0 à la place si vous utilisez la commande 'banset'.\n"); - ladmin_log ("Date incorrecte. (command 'banset' ou 'ban').\n"); - } - else - { - printf ("Invalid date.\n"); - printf - ("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n"); - printf - ("You can imput 0 instead of if you use 'banset' command.\n"); - ladmin_log ("Invalid date. ('banset' or 'ban' command).\n"); - } + tmtime.tm_year = year; + tmtime.tm_mon = month; + tmtime.tm_mday = day; + tmtime.tm_hour = hour; + tmtime.tm_min = minute; + tmtime.tm_sec = second; + tmtime.tm_isdst = -1; // -1: no winter/summer time modification + ban_until_time = tmtime; + if (ban_until_time.error()) + { + PRINTF("Invalid date.\n"); + PRINTF("Please input a date and a time (format: yyyy/mm/dd hh:mm:ss).\n"); + PRINTF("You can imput 0 instead of if you use 'banset' command.\n"); + LADMIN_LOG("Invalid date. ('banset' or 'ban' command).\n"); return 102; } } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour fixer un ban.\n"); - } - else - { - ladmin_log ("Request to login-server to set a ban.\n"); - } + LADMIN_LOG("Request to login-server to set a ban.\n"); - WFIFOW (login_fd, 0) = 0x794a; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOL (login_fd, 26) = (int) ban_until_time; - WFIFOSET (login_fd, 30); + WFIFOW(login_fd, 0) = 0x794a; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOL(login_fd, 26) = static_cast<time_t>(ban_until_time); + WFIFOSET(login_fd, 30); bytes_to_read = 1; return 0; @@ -2249,149 +1234,89 @@ int bansetaccountsub (const char *name, const char *date, const char *time) // Sub-function: Set the final date of a banishment of an account (ban) //--------------------------------------------------------------------- static -int banaccount (const char *param) +int banaccount(const char *param) { - char name[1023], date[1023], time[1023]; - - memset (name, '\0', sizeof (name)); - memset (date, '\0', sizeof (date)); - memset (time, '\0', sizeof (time)); - - if (sscanf (param, "%s %s \"%[^\"]\"", date, time, name) < 3 && - sscanf (param, "%s %s '%[^']'", date, time, name) < 3 && - sscanf (param, "%s %s %[^\r\n]", date, time, name) < 3) - { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte, une date et une heure svp.\n"); - printf - ("<exemple>: banset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n"); - printf (" banset <nom_du_compte> 0 (0 = dé-bani)\n"); - printf - (" ban/banish aaaa/mm/jj hh:mm:ss <nom du compte>\n"); - printf (" unban/unbanish <nom du compte>\n"); - printf (" Heure par défaut [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Nombre incorrect de paramètres pour fixer un ban (commande 'banset' ou 'ban').\n"); - } - else - { - printf ("Please input an account name, a date and a hour.\n"); - printf - ("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); - printf - (" banset <account_name> 0 (0 = un-banished)\n"); - printf - (" ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); - printf (" unban/unbanish <account name>\n"); - printf (" Default time [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Incomplete parameters to set a ban ('banset' or 'ban' command).\n"); - } + char name[1023], date[1023], time_[1023]; + + memset(name, '\0', sizeof(name)); + memset(date, '\0', sizeof(date)); + memset(time_, '\0', sizeof(time_)); + + if (sscanf(param, "%s %s \"%[^\"]\"", date, time_, name) < 3 && + sscanf(param, "%s %s '%[^']'", date, time_, name) < 3 && + sscanf(param, "%s %s %[^\r\n]", date, time_, name) < 3) + { + PRINTF("Please input an account name, a date and a hour.\n"); + PRINTF("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); + PRINTF(" banset <account_name> 0 (0 = un-banished)\n"); + PRINTF(" ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); + PRINTF(" unban/unbanish <account name>\n"); + PRINTF(" Default time [hh:mm:ss]: 23:59:59.\n"); + LADMIN_LOG("Incomplete parameters to set a ban ('banset' or 'ban' command).\n"); return 136; } - return bansetaccountsub (name, date, time); + return bansetaccountsub(name, date, time_); } //------------------------------------------------------------------------ // Sub-function: Set the final date of a banishment of an account (banset) //------------------------------------------------------------------------ static -int bansetaccount (const char *param) +int bansetaccount(const char *param) { - char name[1023], date[1023], time[1023]; - - memset (name, '\0', sizeof (name)); - memset (date, '\0', sizeof (date)); - memset (time, '\0', sizeof (time)); - - if (sscanf (param, "\"%[^\"]\" %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void - sscanf (param, "'%[^']' %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void - sscanf (param, "%s %s %[^\r\n]", name, date, time) < 2) - { // if date = 0, time can be void - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte, une date et une heure svp.\n"); - printf - ("<exemple>: banset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n"); - printf (" banset <nom_du_compte> 0 (0 = dé-bani)\n"); - printf - (" ban/banish aaaa/mm/jj hh:mm:ss <nom du compte>\n"); - printf (" unban/unbanish <nom du compte>\n"); - printf (" Heure par défaut [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Nombre incorrect de paramètres pour fixer un ban (commande 'banset' ou 'ban').\n"); - } - else - { - printf ("Please input an account name, a date and a hour.\n"); - printf - ("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); - printf - (" banset <account_name> 0 (0 = un-banished)\n"); - printf - (" ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); - printf (" unban/unbanish <account name>\n"); - printf (" Default time [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Incomplete parameters to set a ban ('banset' or 'ban' command).\n"); - } + char name[1023], date[1023], time_[1023]; + + memset(name, '\0', sizeof(name)); + memset(date, '\0', sizeof(date)); + memset(time_, '\0', sizeof(time_)); + + if (sscanf(param, "\"%[^\"]\" %s %[^\r\n]", name, date, time_) < 2 && // if date = 0, time_ can be void + sscanf(param, "'%[^']' %s %[^\r\n]", name, date, time_) < 2 && // if date = 0, time_ can be void + sscanf(param, "%s %s %[^\r\n]", name, date, time_) < 2) + { // if date = 0, time_ can be void + PRINTF("Please input an account name, a date and a hour.\n"); + PRINTF("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); + PRINTF(" banset <account_name> 0 (0 = un-banished)\n"); + PRINTF(" ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); + PRINTF(" unban/unbanish <account name>\n"); + PRINTF(" Default time [hh:mm:ss]: 23:59:59.\n"); + LADMIN_LOG("Incomplete parameters to set a ban ('banset' or 'ban' command).\n"); return 136; } - if (time[0] == '\0') - strcpy (time, "23:59:59"); + if (time_[0] == '\0') + strcpy(time_, "23:59:59"); - return bansetaccountsub (name, date, time); + return bansetaccountsub(name, date, time_); } //------------------------------------------------- // Sub-function: unbanishment of an account (unban) //------------------------------------------------- static -int unbanaccount (const char *param) +int unbanaccount(const char *param) { char name[1023]; - memset (name, '\0', sizeof (name)); + memset(name, '\0', sizeof(name)); - if (strlen (param) == 0 || - (sscanf (param, "\"%[^\"]\"", name) < 1 && - sscanf (param, "'%[^']'", name) < 1 && - sscanf (param, "%[^\r\n]", name) < 1) || strlen (name) == 0) + if (strlen(param) == 0 || + (sscanf(param, "\"%[^\"]\"", name) < 1 && + sscanf(param, "'%[^']'", name) < 1 && + sscanf(param, "%[^\r\n]", name) < 1) || strlen(name) == 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf - ("<exemple>: banset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n"); - printf (" banset <nom_du_compte> 0 (0 = dé-bani)\n"); - printf - (" ban/banish aaaa/mm/jj hh:mm:ss <nom du compte>\n"); - printf (" unban/unbanish <nom du compte>\n"); - printf (" Heure par défaut [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Nombre incorrect de paramètres pour fixer un ban (commande 'unban').\n"); - } - else - { - printf ("Please input an account name.\n"); - printf - ("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); - printf - (" banset <account_name> 0 (0 = un-banished)\n"); - printf - (" ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); - printf (" unban/unbanish <account name>\n"); - printf (" Default time [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Incomplete parameters to set a ban ('unban' command).\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<example>: banset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); + PRINTF(" banset <account_name> 0 (0 = un-banished)\n"); + PRINTF(" ban/banish yyyy/mm/dd hh:mm:ss <account name>\n"); + PRINTF(" unban/unbanish <account name>\n"); + PRINTF(" Default time [hh:mm:ss]: 23:59:59.\n"); + LADMIN_LOG("Incomplete parameters to set a ban ('unban' command).\n"); return 136; } - return bansetaccountsub (name, "0", ""); + return bansetaccountsub(name, "0", ""); } //--------------------------------------------------------- @@ -2399,61 +1324,42 @@ int unbanaccount (const char *param) // (Note: never send back a password with login-server!! security of passwords) //--------------------------------------------------------- static -int checkaccount (const char *param) +int checkaccount(const char *param) { char name[1023], password[1023]; - memset (name, '\0', sizeof (name)); - memset (password, '\0', sizeof (password)); + memset(name, '\0', sizeof(name)); + memset(password, '\0', sizeof(password)); - if (sscanf (param, "\"%[^\"]\" %[^\r\n]", name, password) < 1 && // password can be void - sscanf (param, "'%[^']' %[^\r\n]", name, password) < 1 && // password can be void - sscanf (param, "%s %[^\r\n]", name, password) < 1) + if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, password) < 1 && // password can be void + sscanf(param, "'%[^']' %[^\r\n]", name, password) < 1 && // password can be void + sscanf(param, "%s %[^\r\n]", name, password) < 1) { // password can be void - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf ("<exemple> check testname motdepasse\n"); - ladmin_log - ("Nombre incorrect de paramètres pour tester le mot d'un passe d'un compte (commande 'check').\n"); - } - else - { - printf ("Please input an account name.\n"); - printf ("<example> check testname password\n"); - ladmin_log - ("Incomplete parameters to check the password of an account ('check' command).\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<example> check testname password\n"); + LADMIN_LOG("Incomplete parameters to check the password of an account ('check' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - if (strlen (password) == 0) + if (strlen(password) == 0) { - if (typepasswd (password) == 0) + if (typepasswd(password) == 0) return 134; } - if (verify_password (password) == 0) + if (verify_password(password) == 0) return 131; - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour test un mot de passe.\n"); - } - else - { - ladmin_log ("Request to login-server to check a password.\n"); - } + LADMIN_LOG("Request to login-server to check a password.\n"); - WFIFOW (login_fd, 0) = 0x793a; - memcpy (WFIFOP (login_fd, 2), name, 24); - memcpy (WFIFOP (login_fd, 26), password, 24); - WFIFOSET (login_fd, 50); + WFIFOW(login_fd, 0) = 0x793a; + memcpy(WFIFOP(login_fd, 2), name, 24); + memcpy(WFIFOP(login_fd, 26), password, 24); + WFIFOSET(login_fd, 50); bytes_to_read = 1; return 0; @@ -2463,88 +1369,55 @@ int checkaccount (const char *param) // Sub-function: Asking for deletion of an account //------------------------------------------------ static -int delaccount (const char *param) +int delaccount(const char *param) { char name[1023]; char letter; char confirm[1023]; - int i; + int i; - memset (name, '\0', sizeof (name)); + memset(name, '\0', sizeof(name)); - if (strlen (param) == 0 || - (sscanf (param, "\"%[^\"]\"", name) < 1 && - sscanf (param, "'%[^']'", name) < 1 && - sscanf (param, "%[^\r\n]", name) < 1) || strlen (name) == 0) + if (strlen(param) == 0 || + (sscanf(param, "\"%[^\"]\"", name) < 1 && + sscanf(param, "'%[^']'", name) < 1 && + sscanf(param, "%[^\r\n]", name) < 1) || strlen(name) == 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf ("<exemple> del nomtestasupprimer\n"); - ladmin_log - ("Aucun nom donné pour supprimer un compte (commande 'delete').\n"); - } - else - { - printf ("Please input an account name.\n"); - printf ("<example> del testnametodelete\n"); - ladmin_log - ("No name given to delete an account ('delete' command).\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<example> del testnametodelete\n"); + LADMIN_LOG("No name given to delete an account ('delete' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - memset (confirm, '\0', sizeof (confirm)); - while ((confirm[0] != 'o' || defaultlanguage != 'F') && confirm[0] != 'n' - && (confirm[0] != 'y' || defaultlanguage == 'F')) + memset(confirm, '\0', sizeof(confirm)); + while (confirm[0] != 'n' + && confirm[0] != 'y') { - if (defaultlanguage == 'F') - printf - ("\033[1;36m ** Etes-vous vraiment sûr de vouloir SUPPRIMER le compte [$userid]? (o/n) > \033[0m"); - else - printf - ("\033[1;36m ** Are you really sure to DELETE account [$userid]? (y/n) > \033[0m"); - fflush (stdout); - memset (confirm, '\0', sizeof (confirm)); + PRINTF("\033[1;36m ** Are you really sure to DELETE account [$userid]? (y/n) > \033[0m"); + fflush(stdout); + memset(confirm, '\0', sizeof(confirm)); i = 0; - while ((letter = getchar ()) != '\n') + while ((letter = getchar()) != '\n') confirm[i++] = letter; } if (confirm[0] == 'n') { - if (defaultlanguage == 'F') - { - printf ("Suppression annulée.\n"); - ladmin_log - ("Suppression annulée par l'utilisateur (commande 'delete').\n"); - } - else - { - printf ("Deletion canceled.\n"); - ladmin_log ("Deletion canceled by user ('delete' command).\n"); - } + PRINTF("Deletion canceled.\n"); + LADMIN_LOG("Deletion canceled by user ('delete' command).\n"); return 121; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour détruire un compte.\n"); - } - else - { - ladmin_log ("Request to login-server to delete an acount.\n"); - } + LADMIN_LOG("Request to login-server to delete an acount.\n"); - WFIFOW (login_fd, 0) = 0x7932; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOSET (login_fd, 26); + WFIFOW(login_fd, 0) = 0x7932; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOSET(login_fd, 26); bytes_to_read = 1; return 0; @@ -2554,114 +1427,59 @@ int delaccount (const char *param) // Sub-function: Asking to modification of an account e-mail //---------------------------------------------------------- static -int changeemail (const char *param) +int changeemail(const char *param) { char name[1023], email[1023]; - memset (name, '\0', sizeof (name)); - memset (email, '\0', sizeof (email)); + memset(name, '\0', sizeof(name)); + memset(email, '\0', sizeof(email)); - if (sscanf (param, "\"%[^\"]\" %[^\r\n]", name, email) < 2 && - sscanf (param, "'%[^']' %[^\r\n]", name, email) < 2 && - sscanf (param, "%s %[^\r\n]", name, email) < 2) + if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, email) < 2 && + sscanf(param, "'%[^']' %[^\r\n]", name, email) < 2 && + sscanf(param, "%s %[^\r\n]", name, email) < 2) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte et une email svp.\n"); - printf ("<exemple> email testname nouveauemail\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer l'email d'un compte (commande 'email').\n"); - } - else - { - printf ("Please input an account name and an email.\n"); - printf ("<example> email testname newemail\n"); - ladmin_log - ("Incomplete parameters to change the email of an account ('email' command).\n"); - } + PRINTF("Please input an account name and an email.\n"); + PRINTF("<example> email testname newemail\n"); + LADMIN_LOG("Incomplete parameters to change the email of an account ('email' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - if (strlen (email) < 3) + if (strlen(email) < 3) { - if (defaultlanguage == 'F') - { - printf ("Email trop courte [%s]. Entrez une e-mail valide svp.\n", - email); - ladmin_log - ("Email trop courte [%s]. Entrez une e-mail valide svp.\n", - email); - } - else - { - printf ("Email is too short [%s]. Please input a valid e-mail.\n", - email); - ladmin_log - ("Email is too short [%s]. Please input a valid e-mail.\n", - email); - } + PRINTF("Email is too short [%s]. Please input a valid e-mail.\n", + email); + LADMIN_LOG("Email is too short [%s]. Please input a valid e-mail.\n", + email); return 109; } - if (strlen (email) > 39) + if (strlen(email) > 39) { - if (defaultlanguage == 'F') - { - printf - ("Email trop longue [%s]. Entrez une e-mail de 39 caractères maximum svp.\n", - email); - ladmin_log - ("Email trop longue [%s]. Entrez une e-mail de 39 caractères maximum svp.\n", - email); - } - else - { - printf - ("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", - email); - ladmin_log - ("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", - email); - } + PRINTF("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", + email); + LADMIN_LOG("Email is too long [%s]. Please input an e-mail with 39 bytes at the most.\n", + email); return 109; } - if (e_mail_check (email) == 0) + if (e_mail_check(email) == 0) { - if (defaultlanguage == 'F') - { - printf ("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", - email); - ladmin_log ("Email incorrecte [%s]. Entrez une e-mail valide svp.\n", - email); - } - else - { - printf ("Invalid email [%s]. Please input a valid e-mail.\n", - email); - ladmin_log ("Invalid email [%s]. Please input a valid e-mail.\n", - email); - } + PRINTF("Invalid email [%s]. Please input a valid e-mail.\n", + email); + LADMIN_LOG("Invalid email [%s]. Please input a valid e-mail.\n", + email); return 109; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour changer une email.\n"); - } - else - { - ladmin_log ("Request to login-server to change an email.\n"); - } + LADMIN_LOG("Request to login-server to change an email.\n"); - WFIFOW (login_fd, 0) = 0x7940; - memcpy (WFIFOP (login_fd, 2), name, 24); - memcpy (WFIFOP (login_fd, 26), email, 40); - WFIFOSET (login_fd, 66); + WFIFOW(login_fd, 0) = 0x7940; + memcpy(WFIFOP(login_fd, 2), name, 24); + memcpy(WFIFOP(login_fd, 26), email, 40); + WFIFOSET(login_fd, 66); bytes_to_read = 1; return 0; @@ -2671,21 +1489,12 @@ int changeemail (const char *param) // Sub-function: Asking of the number of online players //----------------------------------------------------- static -int getlogincount (void) +int getlogincount(void) { - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour obtenir le nombre de joueurs en jeu.\n"); - } - else - { - ladmin_log - ("Request to login-server to obtain the # of online players.\n"); - } + LADMIN_LOG("Request to login-server to obtain the # of online players.\n"); - WFIFOW (login_fd, 0) = 0x7938; - WFIFOSET (login_fd, 2); + WFIFOW(login_fd, 0) = 0x7938; + WFIFOSET(login_fd, 2); bytes_to_read = 1; return 0; @@ -2695,77 +1504,44 @@ int getlogincount (void) // Sub-function: Asking to modify the GM level of an account //---------------------------------------------------------- static -int changegmlevel (const char *param) +int changegmlevel(const char *param) { char name[1023]; - int GM_level; + int GM_level; - memset (name, '\0', sizeof (name)); + memset(name, '\0', sizeof(name)); GM_level = 0; - if (sscanf (param, "\"%[^\"]\" %d", name, &GM_level) < 1 && - sscanf (param, "'%[^']' %d", name, &GM_level) < 1 && - sscanf (param, "%s %d", name, &GM_level) < 1) + if (sscanf(param, "\"%[^\"]\" %d", name, &GM_level) < 1 && + sscanf(param, "'%[^']' %d", name, &GM_level) < 1 && + sscanf(param, "%s %d", name, &GM_level) < 1) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte et un niveau de GM svp.\n"); - printf ("<exemple> gm nomtest 80\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer le Niveau de GM d'un compte (commande 'gm').\n"); - } - else - { - printf ("Please input an account name and a GM level.\n"); - printf ("<example> gm testname 80\n"); - ladmin_log - ("Incomplete parameters to change the GM level of an account ('gm' command).\n"); - } + PRINTF("Please input an account name and a GM level.\n"); + PRINTF("<example> gm testname 80\n"); + LADMIN_LOG("Incomplete parameters to change the GM level of an account ('gm' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } if (GM_level < 0 || GM_level > 99) { - if (defaultlanguage == 'F') - { - printf - ("Niveau de GM incorrect [%d]. Entrez une valeur de 0 à 99 svp.\n", - GM_level); - ladmin_log - ("Niveau de GM incorrect [%d]. La valeur peut être de 0 à 99.\n", - GM_level); - } - else - { - printf - ("Illegal GM level [%d]. Please input a value from 0 to 99.\n", - GM_level); - ladmin_log - ("Illegal GM level [%d]. The value can be from 0 to 99.\n", - GM_level); - } + PRINTF("Illegal GM level [%d]. Please input a value from 0 to 99.\n", + GM_level); + LADMIN_LOG("Illegal GM level [%d]. The value can be from 0 to 99.\n", + GM_level); return 103; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour changer un niveau de GM.\n"); - } - else - { - ladmin_log ("Request to login-server to change a GM level.\n"); - } + LADMIN_LOG("Request to login-server to change a GM level.\n"); - WFIFOW (login_fd, 0) = 0x793e; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOB (login_fd, 26) = GM_level; - WFIFOSET (login_fd, 27); + WFIFOW(login_fd, 0) = 0x793e; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOB(login_fd, 26) = GM_level; + WFIFOSET(login_fd, 27); bytes_to_read = 1; return 0; @@ -2775,52 +1551,33 @@ int changegmlevel (const char *param) // Sub-function: Asking to obtain an account id //--------------------------------------------- static -int idaccount (const char *param) +int idaccount(const char *param) { char name[1023]; - memset (name, '\0', sizeof (name)); + memset(name, '\0', sizeof(name)); - if (strlen (param) == 0 || - (sscanf (param, "\"%[^\"]\"", name) < 1 && - sscanf (param, "'%[^']'", name) < 1 && - sscanf (param, "%[^\r\n]", name) < 1) || strlen (name) == 0) + if (strlen(param) == 0 || + (sscanf(param, "\"%[^\"]\"", name) < 1 && + sscanf(param, "'%[^']'", name) < 1 && + sscanf(param, "%[^\r\n]", name) < 1) || strlen(name) == 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf ("<exemple> id nomtest\n"); - ladmin_log - ("Aucun nom donné pour rechecher l'id d'un compte (commande 'id').\n"); - } - else - { - printf ("Please input an account name.\n"); - printf ("<example> id testname\n"); - ladmin_log - ("No name given to search an account id ('id' command).\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<example> id testname\n"); + LADMIN_LOG("No name given to search an account id ('id' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour connaître l'id d'un compte.\n"); - } - else - { - ladmin_log ("Request to login-server to know an account id.\n"); - } + LADMIN_LOG("Request to login-server to know an account id.\n"); - WFIFOW (login_fd, 0) = 0x7944; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOSET (login_fd, 26); + WFIFOW(login_fd, 0) = 0x7944; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOSET(login_fd, 26); bytes_to_read = 1; return 0; @@ -2830,38 +1587,20 @@ int idaccount (const char *param) // Sub-function: Asking to displaying information about an account (by its id) //---------------------------------------------------------------------------- static -int infoaccount (int account_id) +int infoaccount(int account_id) { if (account_id < 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un id ayant une valeur positive svp.\n"); - ladmin_log - ("Une valeur négative a été donné pour trouver le compte.\n"); - } - else - { - printf ("Please input a positive value for the id.\n"); - ladmin_log ("Negative value was given to found the account.\n"); - } + PRINTF("Please input a positive value for the id.\n"); + LADMIN_LOG("Negative value was given to found the account.\n"); return 136; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour obtenir le information d'un compte (par l'id).\n"); - } - else - { - ladmin_log - ("Request to login-server to obtain information about an account (by its id).\n"); - } + LADMIN_LOG("Request to login-server to obtain information about an account (by its id).\n"); - WFIFOW (login_fd, 0) = 0x7954; - WFIFOL (login_fd, 2) = account_id; - WFIFOSET (login_fd, 6); + WFIFOW(login_fd, 0) = 0x7954; + WFIFOL(login_fd, 2) = account_id; + WFIFOSET(login_fd, 6); bytes_to_read = 1; return 0; @@ -2871,117 +1610,42 @@ int infoaccount (int account_id) // Sub-function: Send a broadcast message //--------------------------------------- static -int sendbroadcast (short type, const char *message) +int sendbroadcast(short type, const char *message) { - if (strlen (message) == 0) + if (strlen(message) == 0) { - if (defaultlanguage == 'F') + PRINTF("Please input a message.\n"); + if (type == 0) { - printf ("Entrez un message svp.\n"); - if (type == 0) - { - printf ("<exemple> kami un message\n"); - } - else - { - printf ("<exemple> kamib un message\n"); - } - ladmin_log ("Le message est vide (commande 'kami(b)').\n"); + PRINTF("<example> kami a message\n"); } else { - printf ("Please input a message.\n"); - if (type == 0) - { - printf ("<example> kami a message\n"); - } - else - { - printf ("<example> kamib a message\n"); - } - ladmin_log ("The message is void ('kami(b)' command).\n"); + PRINTF("<example> kamib a message\n"); } + LADMIN_LOG("The message is void ('kami(b)' command).\n"); return 136; } - WFIFOW (login_fd, 0) = 0x794e; - WFIFOW (login_fd, 2) = type; - WFIFOL (login_fd, 4) = strlen (message) + 1; - memcpy (WFIFOP (login_fd, 8), message, strlen (message) + 1); - WFIFOSET (login_fd, 8 + strlen (message) + 1); + WFIFOW(login_fd, 0) = 0x794e; + WFIFOW(login_fd, 2) = type; + WFIFOL(login_fd, 4) = strlen(message) + 1; + memcpy(WFIFOP(login_fd, 8), message, strlen(message) + 1); + WFIFOSET(login_fd, 8 + strlen(message) + 1); bytes_to_read = 1; return 0; } -//-------------------------------------------- -// Sub-function: Change language of displaying -//-------------------------------------------- -static -int changelanguage (char *language) -{ - if (strlen (language) == 0) - { - if (defaultlanguage == 'F') - { - printf ("Entrez une langue svp.\n"); - printf ("<exemple> language english\n"); - printf (" language français\n"); - ladmin_log ("La langue est vide (commande 'language').\n"); - } - else - { - printf ("Please input a language.\n"); - printf ("<example> language english\n"); - printf (" language français\n"); - ladmin_log ("The language is void ('language' command).\n"); - } - return 136; - } - - language[0] = toupper (language[0]); - if (language[0] == 'F' || language[0] == 'E') - { - defaultlanguage = language[0]; - if (defaultlanguage == 'F') - { - printf ("Changement de la langue d'affichage en Français.\n"); - ladmin_log ("Changement de la langue d'affichage en Français.\n"); - } - else - { - printf ("Displaying language changed to English.\n"); - ladmin_log ("Displaying language changed to English.\n"); - } - } - else - { - if (defaultlanguage == 'F') - { - printf - ("Langue non paramétrée (langues possibles: 'Français' ou 'English').\n"); - ladmin_log - ("Langue non paramétrée (Français ou English nécessaire).\n"); - } - else - { - printf - ("Undefined language (possible languages: Français or English).\n"); - ladmin_log ("Undefined language (must be Français or English).\n"); - } - } - - return 0; -} //-------------------------------------------------------- // Sub-function: Asking to Displaying of the accounts list //-------------------------------------------------------- static -int listaccount (char *param, int type) +int listaccount(char *param, int type) { //int list_first, list_last, list_type; // parameter to display a list of accounts - int i; + int i; list_type = type; @@ -2996,7 +1660,7 @@ int listaccount (char *param, int type) else if (list_type == 2) { // if search for (i = 0; param[i]; i++) - param[i] = tolower (param[i]); + param[i] = tolower(param[i]); // get all accounts = use default } else if (list_type == 3) @@ -3009,7 +1673,7 @@ int listaccount (char *param, int type) } else { // if list (list_type == 0) - switch (sscanf (param, "%d %d", &list_first, &list_last)) + switch (sscanf(param, "%d %d", &list_first, &list_last)) { case 0: // get all accounts = use default @@ -3017,6 +1681,7 @@ int listaccount (char *param, int type) case 1: list_last = 0; // use tests of the following value + FALLTHROUGH; default: if (list_first < 0) list_first = 0; @@ -3026,38 +1691,18 @@ int listaccount (char *param, int type) } } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour obtenir la liste des comptes de %d à %d.\n", - list_first, list_last); - } - else - { - ladmin_log - ("Request to login-server to obtain the list of accounts from %d to %d.\n", - list_first, list_last); - } + LADMIN_LOG("Request to login-server to obtain the list of accounts from %d to %d.\n", + list_first, list_last); - WFIFOW (login_fd, 0) = 0x7920; - WFIFOL (login_fd, 2) = list_first; - WFIFOL (login_fd, 6) = list_last; - WFIFOSET (login_fd, 10); + WFIFOW(login_fd, 0) = 0x7920; + WFIFOL(login_fd, 2) = list_first; + WFIFOL(login_fd, 6) = list_last; + WFIFOSET(login_fd, 10); bytes_to_read = 1; // 0123456789 01 01234567890123456789012301234 012345 0123456789012345678901234567 - if (defaultlanguage == 'F') - { - Iprintf - (" id_compte GM nom_utilisateur sexe count statut\n"); - } - else - { - Iprintf - ("account_id GM user_name sex count state\n"); - } - Iprintf - ("-------------------------------------------------------------------------------\n"); + Iprintf("account_id GM user_name sex count state\n"); + Iprintf("-------------------------------------------------------------------------------\n"); list_count = 0; return 0; @@ -3067,20 +1712,20 @@ int listaccount (char *param, int type) // Sub-function: Frobnicate items //-------------------------------------------------------- static -int itemfrob (const char *param) +int itemfrob(const char *param) { - int source_id, dest_id; + int source_id, dest_id; - if (sscanf (param, "%d %d", &source_id, &dest_id) < 2) + if (sscanf(param, "%d %d", &source_id, &dest_id) < 2) { - printf ("You must provide the source and destination item IDs.\n"); + PRINTF("You must provide the source and destination item IDs.\n"); return 1; } - WFIFOW (login_fd, 0) = 0x7924; - WFIFOL (login_fd, 2) = source_id; - WFIFOL (login_fd, 6) = dest_id; - WFIFOSET (login_fd, 10); + WFIFOW(login_fd, 0) = 0x7924; + WFIFOL(login_fd, 2) = source_id; + WFIFOL(login_fd, 6) = dest_id; + WFIFOSET(login_fd, 10); bytes_to_read = 1; // all logging is done to the three main servers return 0; @@ -3090,76 +1735,45 @@ int itemfrob (const char *param) // Sub-function: Asking to modify a memo field //-------------------------------------------- static -int changememo (const char *param) +int changememo(const char *param) { char name[1023], memo[1023]; - memset (name, '\0', sizeof (name)); - memset (memo, '\0', sizeof (memo)); + memset(name, '\0', sizeof(name)); + memset(memo, '\0', sizeof(memo)); - if (sscanf (param, "\"%[^\"]\" %[^\r\n]", name, memo) < 1 && // memo can be void - sscanf (param, "'%[^']' %[^\r\n]", name, memo) < 1 && // memo can be void - sscanf (param, "%s %[^\r\n]", name, memo) < 1) + if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, memo) < 1 && // memo can be void + sscanf(param, "'%[^']' %[^\r\n]", name, memo) < 1 && // memo can be void + sscanf(param, "%s %[^\r\n]", name, memo) < 1) { // memo can be void - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte et un mémo svp.\n"); - printf ("<exemple> memo nomtest nouveau memo\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer le mémo d'un compte (commande 'email').\n"); - } - else - { - printf ("Please input an account name and a memo.\n"); - printf ("<example> memo testname new memo\n"); - ladmin_log - ("Incomplete parameters to change the memo of an account ('email' command).\n"); - } + PRINTF("Please input an account name and a memo.\n"); + PRINTF("<example> memo testname new memo\n"); + LADMIN_LOG("Incomplete parameters to change the memo of an account ('email' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - if (strlen (memo) > 254) + if (strlen(memo) > 254) { - if (defaultlanguage == 'F') - { - printf ("Mémo trop long (%d caractères).\n", strlen (memo)); - printf ("Entrez un mémo de 254 caractères maximum svp.\n"); - ladmin_log - ("Mémo trop long (%d caractères). Entrez un mémo de 254 caractères maximum svp.\n", - strlen (memo)); - } - else - { - printf ("Memo is too long (%d characters).\n", strlen (memo)); - printf ("Please input a memo of 254 bytes at the maximum.\n"); - ladmin_log - ("Email is too long (%d characters). Please input a memo of 254 bytes at the maximum.\n", - strlen (memo)); - } + PRINTF("Memo is too long (%zu characters).\n", strlen(memo)); + PRINTF("Please input a memo of 254 bytes at the maximum.\n"); + LADMIN_LOG("Email is too long (%zu characters). Please input a memo of 254 bytes at the maximum.\n", + strlen(memo)); return 102; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour changer un mémo.\n"); - } - else - { - ladmin_log ("Request to login-server to change a memo.\n"); - } + LADMIN_LOG("Request to login-server to change a memo.\n"); - WFIFOW (login_fd, 0) = 0x7942; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOW (login_fd, 26) = strlen (memo); - if (strlen (memo) > 0) - memcpy (WFIFOP (login_fd, 28), memo, strlen (memo)); - WFIFOSET (login_fd, 28 + strlen (memo)); + WFIFOW(login_fd, 0) = 0x7942; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOW(login_fd, 26) = strlen(memo); + if (strlen(memo) > 0) + memcpy(WFIFOP(login_fd, 28), memo, strlen(memo)); + WFIFOSET(login_fd, 28 + strlen(memo)); bytes_to_read = 1; return 0; @@ -3169,34 +1783,20 @@ int changememo (const char *param) // Sub-function: Asking to obtain an account name //----------------------------------------------- static -int nameaccount (int id) +int nameaccount(int id) { if (id < 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un id ayant une valeur positive svp.\n"); - ladmin_log - ("Id négatif donné pour rechecher le nom d'un compte (commande 'name').\n"); - } - else - { - printf ("Please input a positive value for the id.\n"); - ladmin_log - ("Negativ id given to search an account name ('name' command).\n"); - } + PRINTF("Please input a positive value for the id.\n"); + LADMIN_LOG("Negativ id given to search an account name ('name' command).\n"); return 136; } - if (defaultlanguage == 'F') - ladmin_log - ("Envoi d'un requête au serveur de logins pour connaître le nom d'un compte.\n"); - else - ladmin_log ("Request to login-server to know an account name.\n"); + LADMIN_LOG("Request to login-server to know an account name.\n"); - WFIFOW (login_fd, 0) = 0x7946; - WFIFOL (login_fd, 2) = id; - WFIFOSET (login_fd, 6); + WFIFOW(login_fd, 0) = 0x7946; + WFIFOL(login_fd, 2) = id; + WFIFOSET(login_fd, 6); bytes_to_read = 1; return 0; @@ -3207,61 +1807,42 @@ int nameaccount (int id) // (Note: never send back a password with login-server!! security of passwords) //------------------------------------------ static -int changepasswd (const char *param) +int changepasswd(const char *param) { char name[1023], password[1023]; - memset (name, '\0', sizeof (name)); - memset (password, '\0', sizeof (password)); + memset(name, '\0', sizeof(name)); + memset(password, '\0', sizeof(password)); - if (sscanf (param, "\"%[^\"]\" %[^\r\n]", name, password) < 1 && - sscanf (param, "'%[^']' %[^\r\n]", name, password) < 1 && - sscanf (param, "%s %[^\r\n]", name, password) < 1) + if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, password) < 1 && + sscanf(param, "'%[^']' %[^\r\n]", name, password) < 1 && + sscanf(param, "%s %[^\r\n]", name, password) < 1) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf ("<exemple> passwd nomtest nouveaumotdepasse\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer le mot d'un passe d'un compte (commande 'password').\n"); - } - else - { - printf ("Please input an account name.\n"); - printf ("<example> passwd testname newpassword\n"); - ladmin_log - ("Incomplete parameters to change the password of an account ('password' command).\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<example> passwd testname newpassword\n"); + LADMIN_LOG("Incomplete parameters to change the password of an account ('password' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - if (strlen (password) == 0) + if (strlen(password) == 0) { - if (typepasswd (password) == 0) + if (typepasswd(password) == 0) return 134; } - if (verify_password (password) == 0) + if (verify_password(password) == 0) return 131; - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour changer un mot de passe.\n"); - } - else - { - ladmin_log ("Request to login-server to change a password.\n"); - } + LADMIN_LOG("Request to login-server to change a password.\n"); - WFIFOW (login_fd, 0) = 0x7934; - memcpy (WFIFOP (login_fd, 2), name, 24); - memcpy (WFIFOP (login_fd, 26), password, 24); - WFIFOSET (login_fd, 50); + WFIFOW(login_fd, 0) = 0x7934; + memcpy(WFIFOP(login_fd, 2), name, 24); + memcpy(WFIFOP(login_fd, 26), password, 24); + WFIFOSET(login_fd, 50); bytes_to_read = 1; return 0; @@ -3272,27 +1853,16 @@ int changepasswd (const char *param) // this function have no answer //---------------------------------------------------------------------- static -int reloadGM (void) +int reloadGM(char *params) { - WFIFOW (login_fd, 0) = 0x7955; - WFIFOSET (login_fd, 2); + WFIFOW(login_fd, 0) = 0x7955; + WFIFOSET(login_fd, 2); bytes_to_read = 0; - if (defaultlanguage == 'F') - { - ladmin_log - ("Demande de recharger le fichier de configuration des GM envoyée.\n"); - printf - ("Demande de recharger le fichier de configuration des GM envoyée.\n"); - printf ("Vérifiez les comptes GM actuels (après rechargement):\n"); - } - else - { - ladmin_log ("Request to reload the GM configuration file sended.\n"); - printf ("Request to reload the GM configuration file sended.\n"); - printf ("Check the actual GM accounts (after reloading):\n"); - } - listaccount (parameters, 1); // 1: to list only GM + LADMIN_LOG("Request to reload the GM configuration file sended.\n"); + PRINTF("Request to reload the GM configuration file sended.\n"); + PRINTF("Check the actual GM accounts (after reloading):\n"); + listaccount(params, 1); // 1: to list only GM return 180; } @@ -3301,71 +1871,43 @@ int reloadGM (void) // Sub-function: Asking to modify the sex of an account //----------------------------------------------------- static -int changesex (const char *param) +int changesex(const char *param) { char name[1023], sex[1023]; - memset (name, '\0', sizeof (name)); - memset (sex, '\0', sizeof (sex)); + memset(name, '\0', sizeof(name)); + memset(sex, '\0', sizeof(sex)); - if (sscanf (param, "\"%[^\"]\" %[^\r\n]", name, sex) < 2 && - sscanf (param, "'%[^']' %[^\r\n]", name, sex) < 2 && - sscanf (param, "%s %[^\r\n]", name, sex) < 2) + if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, sex) < 2 && + sscanf(param, "'%[^']' %[^\r\n]", name, sex) < 2 && + sscanf(param, "%s %[^\r\n]", name, sex) < 2) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte et un sexe svp.\n"); - printf ("<exemple> sex nomtest Male\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer le sexe d'un compte (commande 'sex').\n"); - } - else - { - printf ("Please input an account name and a sex.\n"); - printf ("<example> sex testname Male\n"); - ladmin_log - ("Incomplete parameters to change the sex of an account ('sex' command).\n"); - } + PRINTF("Please input an account name and a sex.\n"); + PRINTF("<example> sex testname Male\n"); + LADMIN_LOG("Incomplete parameters to change the sex of an account ('sex' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - sex[0] = toupper (sex[0]); - if (strchr ("MF", sex[0]) == NULL) + sex[0] = toupper(sex[0]); + if (strchr("MF", sex[0]) == NULL) { - if (defaultlanguage == 'F') - { - printf ("Sexe incorrect [%s]. Entrez M ou F svp.\n", sex); - ladmin_log ("Sexe incorrect [%s]. Entrez M ou F svp.\n", - sex); - } - else - { - printf ("Illegal gender [%s]. Please input M or F.\n", sex); - ladmin_log ("Illegal gender [%s]. Please input M or F.\n", - sex); - } + PRINTF("Illegal gender [%s]. Please input M or F.\n", sex); + LADMIN_LOG("Illegal gender [%s]. Please input M or F.\n", + sex); return 103; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour changer un sexe.\n"); - } - else - { - ladmin_log ("Request to login-server to change a sex.\n"); - } + LADMIN_LOG("Request to login-server to change a sex.\n"); - WFIFOW (login_fd, 0) = 0x793c; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOB (login_fd, 26) = sex[0]; - WFIFOSET (login_fd, 27); + WFIFOW(login_fd, 0) = 0x793c; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOB(login_fd, 26) = sex[0]; + WFIFOSET(login_fd, 27); bytes_to_read = 1; return 0; @@ -3376,120 +1918,62 @@ int changesex (const char *param) // Asking to modify the state of an account //------------------------------------------------------------------------- static -int changestatesub (const char *name, int state, const char *error_message7) +int changestatesub(const char *name, int state, const char *error_message7) { char error_message[1023]; // need to use, because we can modify error_message7 - memset (error_message, '\0', sizeof (error_message)); - strncpy (error_message, error_message7, sizeof (error_message) - 1); + memset(error_message, '\0', sizeof(error_message)); + strncpy(error_message, error_message7, sizeof(error_message) - 1); if ((state < 0 || state > 9) && state != 100) { // Valid values: 0: ok, or value of the 0x006a packet + 1 - if (defaultlanguage == 'F') - { - printf ("Entrez une des statuts suivantes svp:\n"); - printf - (" 0 = Compte ok 6 = Your Game's EXE file is not the latest version\n"); - } - else - { - printf ("Please input one of these states:\n"); - printf - (" 0 = Account ok 6 = Your Game's EXE file is not the latest version\n"); - } - printf - (" 1 = Unregistered ID 7 = You are Prohibited to log in until + message\n"); - printf - (" 2 = Incorrect Password 8 = Server is jammed due to over populated\n"); - printf (" 3 = This ID is expired 9 = No MSG\n"); - printf - (" 4 = Rejected from Server 100 = This ID has been totally erased\n"); - printf (" 5 = You have been blocked by the GM Team\n"); - if (defaultlanguage == 'F') - { - printf ("<exemples> state nomtest 5\n"); - printf (" state nomtest 7 fin de votre ban\n"); - printf (" block <nom compte>\n"); - printf (" unblock <nom compte>\n"); - ladmin_log - ("Valeur incorrecte pour le statut d'un compte (commande 'state', 'block' ou 'unblock').\n"); - } - else - { - printf ("<examples> state testname 5\n"); - printf (" state testname 7 end of your ban\n"); - printf (" block <account name>\n"); - printf (" unblock <account name>\n"); - ladmin_log - ("Invalid value for the state of an account ('state', 'block' or 'unblock' command).\n"); - } + PRINTF("Please input one of these states:\n"); + PRINTF(" 0 = Account ok 6 = Your Game's EXE file is not the latest version\n"); + PRINTF(" 1 = Unregistered ID 7 = You are Prohibited to log in until + message\n"); + PRINTF(" 2 = Incorrect Password 8 = Server is jammed due to over populated\n"); + PRINTF(" 3 = This ID is expired 9 = No MSG\n"); + PRINTF(" 4 = Rejected from Server 100 = This ID has been totally erased\n"); + PRINTF(" 5 = You have been blocked by the GM Team\n"); + PRINTF("<examples> state testname 5\n"); + PRINTF(" state testname 7 end of your ban\n"); + PRINTF(" block <account name>\n"); + PRINTF(" unblock <account name>\n"); + LADMIN_LOG("Invalid value for the state of an account ('state', 'block' or 'unblock' command).\n"); return 151; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } if (state != 7) { - strcpy (error_message, "-"); + strcpy(error_message, "-"); } else { - if (strlen (error_message) < 1) + if (strlen(error_message) < 1) { - if (defaultlanguage == 'F') - { - printf - ("Message d'erreur trop court. Entrez un message de 1-19 caractères.\n"); - ladmin_log - ("Message d'erreur trop court. Entrez un message de 1-19 caractères.\n"); - } - else - { - printf - ("Error message is too short. Please input a message of 1-19 bytes.\n"); - ladmin_log - ("Error message is too short. Please input a message of 1-19 bytes.\n"); - } + PRINTF("Error message is too short. Please input a message of 1-19 bytes.\n"); + LADMIN_LOG("Error message is too short. Please input a message of 1-19 bytes.\n"); return 102; } - if (strlen (error_message) > 19) + if (strlen(error_message) > 19) { - if (defaultlanguage == 'F') - { - printf - ("Message d'erreur trop long. Entrez un message de 1-19 caractères.\n"); - ladmin_log - ("Message d'erreur trop long. Entrez un message de 1-19 caractères.\n"); - } - else - { - printf - ("Error message is too long. Please input a message of 1-19 bytes.\n"); - ladmin_log - ("Error message is too long. Please input a message of 1-19 bytes.\n"); - } + PRINTF("Error message is too long. Please input a message of 1-19 bytes.\n"); + LADMIN_LOG("Error message is too long. Please input a message of 1-19 bytes.\n"); return 102; } } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour changer un statut.\n"); - } - else - { - ladmin_log ("Request to login-server to change a state.\n"); - } + LADMIN_LOG("Request to login-server to change a state.\n"); - WFIFOW (login_fd, 0) = 0x7936; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOL (login_fd, 26) = state; - memcpy (WFIFOP (login_fd, 30), error_message, 20); - WFIFOSET (login_fd, 50); + WFIFOW(login_fd, 0) = 0x7936; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOL(login_fd, 26) = state; + memcpy(WFIFOP(login_fd, 30), error_message, 20); + WFIFOSET(login_fd, 50); bytes_to_read = 1; return 0; @@ -3499,181 +1983,124 @@ int changestatesub (const char *name, int state, const char *error_message7) // Sub-function: Asking to modify the state of an account //------------------------------------------------------- static -int changestate (const char *param) +int changestate(const char *param) { char name[1023], error_message[1023]; - int state; + int state; - memset (name, '\0', sizeof (name)); - memset (error_message, '\0', sizeof (error_message)); + memset(name, '\0', sizeof(name)); + memset(error_message, '\0', sizeof(error_message)); - if (sscanf (param, "\"%[^\"]\" %d %[^\r\n]", name, &state, error_message) + if (sscanf(param, "\"%[^\"]\" %d %[^\r\n]", name, &state, error_message) < 2 - && sscanf (param, "'%[^']' %d %[^\r\n]", name, &state, + && sscanf(param, "'%[^']' %d %[^\r\n]", name, &state, error_message) < 2 - && sscanf (param, "%s %d %[^\r\n]", name, &state, error_message) < 2) - { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte et un statut svp.\n"); - printf ("<exemples> state nomtest 5\n"); - printf (" state nomtest 7 fin de votre ban\n"); - printf (" block <nom compte>\n"); - printf (" unblock <nom compte>\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer le statut d'un compte (commande 'state').\n"); - } - else - { - printf ("Please input an account name and a state.\n"); - printf ("<examples> state testname 5\n"); - printf (" state testname 7 end of your ban\n"); - printf (" block <account name>\n"); - printf (" unblock <account name>\n"); - ladmin_log - ("Incomplete parameters to change the state of an account ('state' command).\n"); - } + && sscanf(param, "%s %d %[^\r\n]", name, &state, error_message) < 2) + { + PRINTF("Please input an account name and a state.\n"); + PRINTF("<examples> state testname 5\n"); + PRINTF(" state testname 7 end of your ban\n"); + PRINTF(" block <account name>\n"); + PRINTF(" unblock <account name>\n"); + LADMIN_LOG("Incomplete parameters to change the state of an account ('state' command).\n"); return 136; } - return changestatesub (name, state, error_message); + return changestatesub(name, state, error_message); } //------------------------------------------- // Sub-function: Asking to unblock an account //------------------------------------------- static -int unblockaccount (const char *param) +int unblockaccount(const char *param) { char name[1023]; - memset (name, '\0', sizeof (name)); + memset(name, '\0', sizeof(name)); - if (strlen (param) == 0 || - (sscanf (param, "\"%[^\"]\"", name) < 1 && - sscanf (param, "'%[^']'", name) < 1 && - sscanf (param, "%[^\r\n]", name) < 1) || strlen (name) == 0) + if (strlen(param) == 0 || + (sscanf(param, "\"%[^\"]\"", name) < 1 && + sscanf(param, "'%[^']'", name) < 1 && + sscanf(param, "%[^\r\n]", name) < 1) || strlen(name) == 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf ("<exemples> state nomtest 5\n"); - printf (" state nomtest 7 fin de votre ban\n"); - printf (" block <nom compte>\n"); - printf (" unblock <nom compte>\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer le statut d'un compte (commande 'unblock').\n"); - } - else - { - printf ("Please input an account name.\n"); - printf ("<examples> state testname 5\n"); - printf (" state testname 7 end of your ban\n"); - printf (" block <account name>\n"); - printf (" unblock <account name>\n"); - ladmin_log - ("Incomplete parameters to change the state of an account ('unblock' command).\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<examples> state testname 5\n"); + PRINTF(" state testname 7 end of your ban\n"); + PRINTF(" block <account name>\n"); + PRINTF(" unblock <account name>\n"); + LADMIN_LOG("Incomplete parameters to change the state of an account ('unblock' command).\n"); return 136; } - return changestatesub (name, 0, "-"); // state 0, no error message + return changestatesub(name, 0, "-"); // state 0, no error message } //------------------------------------------- // Sub-function: Asking to unblock an account //------------------------------------------- static -int blockaccount (const char *param) +int blockaccount(const char *param) { char name[1023]; - memset (name, '\0', sizeof (name)); + memset(name, '\0', sizeof(name)); - if (strlen (param) == 0 || - (sscanf (param, "\"%[^\"]\"", name) < 1 && - sscanf (param, "'%[^']'", name) < 1 && - sscanf (param, "%[^\r\n]", name) < 1) || strlen (name) == 0) + if (strlen(param) == 0 || + (sscanf(param, "\"%[^\"]\"", name) < 1 && + sscanf(param, "'%[^']'", name) < 1 && + sscanf(param, "%[^\r\n]", name) < 1) || strlen(name) == 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf ("<exemples> state nomtest 5\n"); - printf (" state nomtest 7 fin de votre ban\n"); - printf (" block <nom compte>\n"); - printf (" unblock <nom compte>\n"); - ladmin_log - ("Nombre incorrect de paramètres pour changer le statut d'un compte (commande 'block').\n"); - } - else - { - printf ("Please input an account name.\n"); - printf ("<examples> state testname 5\n"); - printf (" state testname 7 end of your ban\n"); - printf (" block <account name>\n"); - printf (" unblock <account name>\n"); - ladmin_log - ("Incomplete parameters to change the state of an account ('block' command).\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<examples> state testname 5\n"); + PRINTF(" state testname 7 end of your ban\n"); + PRINTF(" block <account name>\n"); + PRINTF(" unblock <account name>\n"); + LADMIN_LOG("Incomplete parameters to change the state of an account ('block' command).\n"); return 136; } - return changestatesub (name, 5, "-"); // state 5, no error message + return changestatesub(name, 5, "-"); // state 5, no error message } //--------------------------------------------------------------------- // Sub-function: Add/substract time to the validity limit of an account //--------------------------------------------------------------------- static -int timeaddaccount (const char *param) +int timeaddaccount(const char *param) { char name[1023], modif[1023]; - int year, month, day, hour, minute, second; + int year, month, day, hour, minute, second; const char *p_modif; - int value, i; + int value, i; - memset (name, '\0', sizeof (name)); - memset (modif, '\0', sizeof (modif)); + memset(name, '\0', sizeof(name)); + memset(modif, '\0', sizeof(modif)); year = month = day = hour = minute = second = 0; - if (sscanf (param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 && - sscanf (param, "'%[^']' %[^\r\n]", name, modif) < 2 && - sscanf (param, "%s %[^\r\n]", name, modif) < 2) + if (sscanf(param, "\"%[^\"]\" %[^\r\n]", name, modif) < 2 && + sscanf(param, "'%[^']' %[^\r\n]", name, modif) < 2 && + sscanf(param, "%s %[^\r\n]", name, modif) < 2) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte et un modificateur svp.\n"); - printf (" <exemple> timeadd nomtest +1m-2mn1s-6y\n"); - printf - (" Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n"); - printf (" et 6 ans dans le même temps.\n"); - ladmin_log - ("Nombre incorrect de paramètres pour modifier une date limite d'utilisation (commande 'timeadd').\n"); - } - else - { - printf ("Please input an account name and a modifier.\n"); - printf (" <example>: timeadd testname +1m-2mn1s-6y\n"); - printf - (" this example adds 1 month and 1 second, and substracts 2 minutes\n"); - printf (" and 6 years at the same time.\n"); - ladmin_log - ("Incomplete parameters to modify a limit time ('timeadd' command).\n"); - } + PRINTF("Please input an account name and a modifier.\n"); + PRINTF(" <example>: timeadd testname +1m-2mn1s-6y\n"); + PRINTF(" this example adds 1 month and 1 second, and substracts 2 minutes\n"); + PRINTF(" and 6 years at the same time.\n"); + LADMIN_LOG("Incomplete parameters to modify a limit time ('timeadd' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } // lowercase for modif for (i = 0; modif[i]; i++) - modif[i] = tolower (modif[i]); + modif[i] = tolower(modif[i]); p_modif = modif; - while (strlen (p_modif) > 0) + while (strlen(p_modif) > 0) { - value = atoi (p_modif); + value = atoi(p_modif); if (value == 0) { p_modif++; @@ -3682,7 +2109,7 @@ int timeaddaccount (const char *param) { if (p_modif[0] == '-' || p_modif[0] == '+') p_modif++; - while (strlen (p_modif) > 0 && p_modif[0] >= '0' + while (strlen(p_modif) > 0 && p_modif[0] >= '0' && p_modif[0] <= '9') { p_modif++; @@ -3724,193 +2151,79 @@ int timeaddaccount (const char *param) } } - if (defaultlanguage == 'F') - { - printf (" année: %d\n", year); - printf (" mois: %d\n", month); - printf (" jour: %d\n", day); - printf (" heure: %d\n", hour); - printf (" minute: %d\n", minute); - printf (" seconde: %d\n", second); - } - else - { - printf (" year: %d\n", year); - printf (" month: %d\n", month); - printf (" day: %d\n", day); - printf (" hour: %d\n", hour); - printf (" minute: %d\n", minute); - printf (" second: %d\n", second); - } + PRINTF(" year: %d\n", year); + PRINTF(" month: %d\n", month); + PRINTF(" day: %d\n", day); + PRINTF(" hour: %d\n", hour); + PRINTF(" minute: %d\n", minute); + PRINTF(" second: %d\n", second); if (year == 0 && month == 0 && day == 0 && hour == 0 && minute == 0 && second == 0) { - if (defaultlanguage == 'F') - { - printf - ("Vous devez entrer un ajustement avec cette commande, svp:\n"); - printf (" Valeur d'ajustement (-1, 1, +1, etc...)\n"); - printf (" Elément modifié:\n"); - printf (" a ou y: année\n"); - printf (" m: mois\n"); - printf (" j ou d: jour\n"); - printf (" h: heure\n"); - printf (" mn: minute\n"); - printf (" s: seconde\n"); - printf (" <exemple> timeadd nomtest +1m-2mn1s-6y\n"); - printf - (" Cette exemple ajoute 1 mois et 1 seconde, et soustrait 2 minutes\n"); - printf (" et 6 ans dans le même temps.\n"); - ladmin_log - ("Aucun ajustement n'est pas un ajustement (commande 'timeadd').\n"); - } - else - { - printf ("Please give an adjustment with this command:\n"); - printf (" Adjustment value (-1, 1, +1, etc...)\n"); - printf (" Modified element:\n"); - printf (" a or y: year\n"); - printf (" m: month\n"); - printf (" j or d: day\n"); - printf (" h: hour\n"); - printf (" mn: minute\n"); - printf (" s: second\n"); - printf (" <example> timeadd testname +1m-2mn1s-6y\n"); - printf - (" this example adds 1 month and 1 second, and substracts 2 minutes\n"); - printf (" and 6 years at the same time.\n"); - ladmin_log - ("No adjustment isn't an adjustment ('timeadd' command).\n"); - } + PRINTF("Please give an adjustment with this command:\n"); + PRINTF(" Adjustment value (-1, 1, +1, etc...)\n"); + PRINTF(" Modified element:\n"); + PRINTF(" a or y: year\n"); + PRINTF(" m: month\n"); + PRINTF(" j or d: day\n"); + PRINTF(" h: hour\n"); + PRINTF(" mn: minute\n"); + PRINTF(" s: second\n"); + PRINTF(" <example> timeadd testname +1m-2mn1s-6y\n"); + PRINTF(" this example adds 1 month and 1 second, and substracts 2 minutes\n"); + PRINTF(" and 6 years at the same time.\n"); + LADMIN_LOG("No adjustment isn't an adjustment ('timeadd' command).\n"); return 137; } if (year > 127 || year < -127) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement d'années correct (de -127 à 127), svp.\n"); - ladmin_log - ("Ajustement de l'année hors norme ('timeadd' command).\n"); - } - else - { - printf - ("Please give a correct adjustment for the years (from -127 to 127).\n"); - ladmin_log - ("Abnormal adjustement for the year ('timeadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the years (from -127 to 127).\n"); + LADMIN_LOG("Abnormal adjustement for the year ('timeadd' command).\n"); return 137; } if (month > 255 || month < -255) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de mois correct (de -255 à 255), svp.\n"); - ladmin_log ("Ajustement du mois hors norme ('timeadd' command).\n"); - } - else - { - printf - ("Please give a correct adjustment for the months (from -255 to 255).\n"); - ladmin_log - ("Abnormal adjustement for the month ('timeadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the months (from -255 to 255).\n"); + LADMIN_LOG("Abnormal adjustement for the month ('timeadd' command).\n"); return 137; } if (day > 32767 || day < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de jours correct (de -32767 à 32767), svp.\n"); - ladmin_log ("Ajustement des jours hors norme ('timeadd' command).\n"); - } - else - { - printf - ("Please give a correct adjustment for the days (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the days ('timeadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the days (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the days ('timeadd' command).\n"); return 137; } if (hour > 32767 || hour < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement d'heures correct (de -32767 à 32767), svp.\n"); - ladmin_log - ("Ajustement des heures hors norme ('timeadd' command).\n"); - } - else - { - printf - ("Please give a correct adjustment for the hours (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the hours ('timeadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the hours (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the hours ('timeadd' command).\n"); return 137; } if (minute > 32767 || minute < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de minutes correct (de -32767 à 32767), svp.\n"); - ladmin_log - ("Ajustement des minutes hors norme ('timeadd' command).\n"); - } - else - { - printf - ("Please give a correct adjustment for the minutes (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the minutes ('timeadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the minutes (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the minutes ('timeadd' command).\n"); return 137; } if (second > 32767 || second < -32767) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un ajustement de secondes correct (de -32767 à 32767), svp.\n"); - ladmin_log - ("Ajustement des secondes hors norme ('timeadd' command).\n"); - } - else - { - printf - ("Please give a correct adjustment for the seconds (from -32767 to 32767).\n"); - ladmin_log - ("Abnormal adjustement for the seconds ('timeadd' command).\n"); - } + PRINTF("Please give a correct adjustment for the seconds (from -32767 to 32767).\n"); + LADMIN_LOG("Abnormal adjustement for the seconds ('timeadd' command).\n"); return 137; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour modifier une date limite d'utilisation.\n"); - } - else - { - ladmin_log ("Request to login-server to modify a time limit.\n"); - } - - WFIFOW (login_fd, 0) = 0x7950; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOW (login_fd, 26) = (short) year; - WFIFOW (login_fd, 28) = (short) month; - WFIFOW (login_fd, 30) = (short) day; - WFIFOW (login_fd, 32) = (short) hour; - WFIFOW (login_fd, 34) = (short) minute; - WFIFOW (login_fd, 36) = (short) second; - WFIFOSET (login_fd, 38); + LADMIN_LOG("Request to login-server to modify a time limit.\n"); + + WFIFOW(login_fd, 0) = 0x7950; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOW(login_fd, 26) = (short) year; + WFIFOW(login_fd, 28) = (short) month; + WFIFOW(login_fd, 30) = (short) day; + WFIFOW(login_fd, 32) = (short) hour; + WFIFOW(login_fd, 34) = (short) minute; + WFIFOW(login_fd, 36) = (short) second; + WFIFOSET(login_fd, 38); bytes_to_read = 1; return 0; @@ -3920,83 +2233,54 @@ int timeaddaccount (const char *param) // Sub-function: Set a validity limit of an account //------------------------------------------------- static -int timesetaccount (const char *param) +int timesetaccount(const char *param) { - char name[1023], date[1023], time[1023]; - int year, month, day, hour, minute, second; - time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) - struct tm *tmtime; - - memset (name, '\0', sizeof (name)); - memset (date, '\0', sizeof (date)); - memset (time, '\0', sizeof (time)); + char name[1023], date[1023], time_[1023]; + int year, month, day, hour, minute, second; + + memset(name, '\0', sizeof(name)); + memset(date, '\0', sizeof(date)); + memset(time_, '\0', sizeof(time_)); year = month = day = hour = minute = second = 0; - connect_until_time = 0; - tmtime = localtime (&connect_until_time); // initialize - - if (sscanf (param, "\"%[^\"]\" %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void - sscanf (param, "'%[^']' %s %[^\r\n]", name, date, time) < 2 && // if date = 0, time can be void - sscanf (param, "%s %s %[^\r\n]", name, date, time) < 2) - { // if date = 0, time can be void - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte, une date et une heure svp.\n"); - printf - ("<exemple>: timeset <nom_du_compte> aaaa/mm/jj [hh:mm:ss]\n"); - printf - (" timeset <nom_du_compte> 0 (0 = illimité)\n"); - printf (" Heure par défaut [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Nombre incorrect de paramètres pour fixer une date limite d'utilisation (commande 'timeset').\n"); - } - else - { - printf ("Please input an account name, a date and a hour.\n"); - printf - ("<example>: timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); - printf - (" timeset <account_name> 0 (0 = unlimited)\n"); - printf (" Default time [hh:mm:ss]: 23:59:59.\n"); - ladmin_log - ("Incomplete parameters to set a limit time ('timeset' command).\n"); - } + + // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) + TimeT connect_until_time = TimeT(); + struct tm tmtime = connect_until_time; // initialize + + if (sscanf(param, "\"%[^\"]\" %s %[^\r\n]", name, date, time_) < 2 && // if date = 0, time_ can be void + sscanf(param, "'%[^']' %s %[^\r\n]", name, date, time_) < 2 && // if date = 0, time_ can be void + sscanf(param, "%s %s %[^\r\n]", name, date, time_) < 2) + { // if date = 0, time_ can be void + PRINTF("Please input an account name, a date and a hour.\n"); + PRINTF("<example>: timeset <account_name> yyyy/mm/dd [hh:mm:ss]\n"); + PRINTF(" timeset <account_name> 0 (0 = unlimited)\n"); + PRINTF(" Default time [hh:mm:ss]: 23:59:59.\n"); + LADMIN_LOG("Incomplete parameters to set a limit time ('timeset' command).\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - if (time[0] == '\0') - strcpy (time, "23:59:59"); + if (time_[0] == '\0') + strcpy(time_, "23:59:59"); - if (atoi (date) != 0 && - ((sscanf (date, "%d/%d/%d", &year, &month, &day) < 3 && - sscanf (date, "%d-%d-%d", &year, &month, &day) < 3 && - sscanf (date, "%d.%d.%d", &year, &month, &day) < 3 && - sscanf (date, "%d'%d'%d", &year, &month, &day) < 3) || - sscanf (time, "%d:%d:%d", &hour, &minute, &second) < 3)) + if (atoi(date) != 0 && + ((sscanf(date, "%d/%d/%d", &year, &month, &day) < 3 && + sscanf(date, "%d-%d-%d", &year, &month, &day) < 3 && + sscanf(date, "%d.%d.%d", &year, &month, &day) < 3 && + sscanf(date, "%d'%d'%d", &year, &month, &day) < 3) || + sscanf(time_, "%d:%d:%d", &hour, &minute, &second) < 3)) { - if (defaultlanguage == 'F') - { - printf - ("Entrez 0 ou une date et une heure svp (format: 0 ou aaaa/mm/jj hh:mm:ss).\n"); - ladmin_log - ("Format incorrect pour la date/heure ('timeset' command).\n"); - } - else - { - printf - ("Please input 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n"); - ladmin_log - ("Invalid format for the date/time ('timeset' command).\n"); - } + PRINTF("Please input 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n"); + LADMIN_LOG("Invalid format for the date/time ('timeset' command).\n"); return 102; } - if (atoi (date) == 0) + if (atoi(date) == 0) { - connect_until_time = 0; + connect_until_time = TimeT(); } else { @@ -4010,147 +2294,66 @@ int timesetaccount (const char *param) } if (month < 1 || month > 12) { - if (defaultlanguage == 'F') - { - printf ("Entrez un mois correct svp (entre 1 et 12).\n"); - ladmin_log ("Mois incorrect pour la date ('timeset' command).\n"); - } - else - { - printf - ("Please give a correct value for the month (from 1 to 12).\n"); - ladmin_log ("Invalid month for the date ('timeset' command).\n"); - } + PRINTF("Please give a correct value for the month (from 1 to 12).\n"); + LADMIN_LOG("Invalid month for the date ('timeset' command).\n"); return 102; } month = month - 1; if (day < 1 || day > 31) { - if (defaultlanguage == 'F') - { - printf ("Entrez un jour correct svp (entre 1 et 31).\n"); - ladmin_log ("Jour incorrect pour la date ('timeset' command).\n"); - } - else - { - printf - ("Please give a correct value for the day (from 1 to 31).\n"); - ladmin_log ("Invalid day for the date ('timeset' command).\n"); - } + PRINTF("Please give a correct value for the day (from 1 to 31).\n"); + LADMIN_LOG("Invalid day for the date ('timeset' command).\n"); return 102; } if (((month == 3 || month == 5 || month == 8 || month == 10) - && day > 30) || (month == 1 && day > 29)) + && day > 30) ||(month == 1 && day > 29)) { - if (defaultlanguage == 'F') - { - printf - ("Entrez un jour correct en fonction du mois (%d) svp.\n", - month); - ladmin_log - ("Jour incorrect pour ce mois correspondant ('timeset' command).\n"); - } - else - { - printf - ("Please give a correct value for a day of this month (%d).\n", - month); - ladmin_log ("Invalid day for this month ('timeset' command).\n"); - } + PRINTF("Please give a correct value for a day of this month (%d).\n", + month); + LADMIN_LOG("Invalid day for this month ('timeset' command).\n"); return 102; } if (hour < 0 || hour > 23) { - if (defaultlanguage == 'F') - { - printf ("Entrez une heure correcte svp (entre 0 et 23).\n"); - ladmin_log - ("Heure incorrecte pour l'heure ('timeset' command).\n"); - } - else - { - printf - ("Please give a correct value for the hour (from 0 to 23).\n"); - ladmin_log ("Invalid hour for the time ('timeset' command).\n"); - } + PRINTF("Please give a correct value for the hour (from 0 to 23).\n"); + LADMIN_LOG("Invalid hour for the time ('timeset' command).\n"); return 102; } if (minute < 0 || minute > 59) { - if (defaultlanguage == 'F') - { - printf - ("Entrez des minutes correctes svp (entre 0 et 59).\n"); - ladmin_log - ("Minute incorrecte pour l'heure ('timeset' command).\n"); - } - else - { - printf - ("Please give a correct value for the minutes (from 0 to 59).\n"); - ladmin_log ("Invalid minute for the time ('timeset' command).\n"); - } + PRINTF("Please give a correct value for the minutes (from 0 to 59).\n"); + LADMIN_LOG("Invalid minute for the time ('timeset' command).\n"); return 102; } if (second < 0 || second > 59) { - if (defaultlanguage == 'F') - { - printf - ("Entrez des secondes correctes svp (entre 0 et 59).\n"); - ladmin_log - ("Seconde incorrecte pour l'heure ('timeset' command).\n"); - } - else - { - printf - ("Please give a correct value for the seconds (from 0 to 59).\n"); - ladmin_log ("Invalid second for the time ('timeset' command).\n"); - } + PRINTF("Please give a correct value for the seconds (from 0 to 59).\n"); + LADMIN_LOG("Invalid second for the time ('timeset' command).\n"); return 102; } - tmtime->tm_year = year; - tmtime->tm_mon = month; - tmtime->tm_mday = day; - tmtime->tm_hour = hour; - tmtime->tm_min = minute; - tmtime->tm_sec = second; - tmtime->tm_isdst = -1; // -1: no winter/summer time modification - connect_until_time = timegm (tmtime); - if (connect_until_time == -1) - { - if (defaultlanguage == 'F') - { - printf ("Date incorrecte.\n"); - printf - ("Ajoutez 0 ou une date et une heure svp (format: 0 ou aaaa/mm/jj hh:mm:ss).\n"); - ladmin_log ("Date incorrecte. ('timeset' command).\n"); - } - else - { - printf ("Invalid date.\n"); - printf - ("Please add 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n"); - ladmin_log ("Invalid date. ('timeset' command).\n"); - } + tmtime.tm_year = year; + tmtime.tm_mon = month; + tmtime.tm_mday = day; + tmtime.tm_hour = hour; + tmtime.tm_min = minute; + tmtime.tm_sec = second; + tmtime.tm_isdst = -1; // -1: no winter/summer time modification + connect_until_time = tmtime; + if (connect_until_time.error()) + { + PRINTF("Invalid date.\n"); + PRINTF("Please add 0 or a date and a time (format: 0 or yyyy/mm/dd hh:mm:ss).\n"); + LADMIN_LOG("Invalid date. ('timeset' command).\n"); return 102; } } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour fixer une date limite d'utilisation.\n"); - } - else - { - ladmin_log ("Request to login-server to set a time limit.\n"); - } + LADMIN_LOG("Request to login-server to set a time limit.\n"); - WFIFOW (login_fd, 0) = 0x7948; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOL (login_fd, 26) = (int) connect_until_time; - WFIFOSET (login_fd, 30); + WFIFOW(login_fd, 0) = 0x7948; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOL(login_fd, 26) = static_cast<time_t>(connect_until_time); + WFIFOSET(login_fd, 30); bytes_to_read = 1; return 0; @@ -4160,50 +2363,32 @@ int timesetaccount (const char *param) // Sub-function: Asking to displaying information about an account (by its name) //------------------------------------------------------------------------------ static -int whoaccount (const char *param) +int whoaccount(const char *param) { char name[1023]; - memset (name, '\0', sizeof (name)); + memset(name, '\0', sizeof(name)); - if (strlen (param) == 0 || - (sscanf (param, "\"%[^\"]\"", name) < 1 && - sscanf (param, "'%[^']'", name) < 1 && - sscanf (param, "%[^\r\n]", name) < 1) || strlen (name) == 0) + if (strlen(param) == 0 || + (sscanf(param, "\"%[^\"]\"", name) < 1 && + sscanf(param, "'%[^']'", name) < 1 && + sscanf(param, "%[^\r\n]", name) < 1) || strlen(name) == 0) { - if (defaultlanguage == 'F') - { - printf ("Entrez un nom de compte svp.\n"); - printf ("<exemple> who nomtest\n"); - ladmin_log ("Aucun nom n'a été donné pour trouver le compte.\n"); - } - else - { - printf ("Please input an account name.\n"); - printf ("<example> who testname\n"); - ladmin_log ("No name was given to found the account.\n"); - } + PRINTF("Please input an account name.\n"); + PRINTF("<example> who testname\n"); + LADMIN_LOG("No name was given to found the account.\n"); return 136; } - if (verify_accountname (name) == 0) + if (verify_accountname(name) == 0) { return 102; } - if (defaultlanguage == 'F') - { - ladmin_log - ("Envoi d'un requête au serveur de logins pour obtenir le information d'un compte (par le nom).\n"); - } - else - { - ladmin_log - ("Request to login-server to obtain information about an account (by its name).\n"); - } + LADMIN_LOG("Request to login-server to obtain information about an account (by its name).\n"); - WFIFOW (login_fd, 0) = 0x7952; - memcpy (WFIFOP (login_fd, 2), name, 24); - WFIFOSET (login_fd, 26); + WFIFOW(login_fd, 0) = 0x7952; + memcpy(WFIFOP(login_fd, 2), name, 24); + WFIFOSET(login_fd, 26); bytes_to_read = 1; return 0; @@ -4213,16 +2398,12 @@ int whoaccount (const char *param) // Sub-function: Asking of the version of the login-server //-------------------------------------------------------- static -int checkloginversion (void) +int checkloginversion(void) { - if (defaultlanguage == 'F') - ladmin_log - ("Envoi d'un requête au serveur de logins pour obtenir sa version.\n"); - else - ladmin_log ("Request to login-server to obtain its version.\n"); + LADMIN_LOG("Request to login-server to obtain its version.\n"); - WFIFOW (login_fd, 0) = 0x7530; - WFIFOSET (login_fd, 2); + WFIFOW(login_fd, 0) = 0x7530; + WFIFOSET(login_fd, 2); bytes_to_read = 1; return 0; @@ -4234,9 +2415,9 @@ int checkloginversion (void) // and analyse the command. //--------------------------------------------- static -int prompt (void) +int prompt(void) { - int i, j; + int i, j; char buf[1024]; char *p; @@ -4244,74 +2425,69 @@ int prompt (void) while (bytes_to_read == 0) { // for help with the console colors look here: - // http://www.edoceo.com/liberum/?doc=printf-with-color + // http://www.edoceo.com/liberum/?doc=PRINTF-with-color // some code explanation (used here): // \033[2J : clear screen and go up/left (0, 0 position) // \033[K : clear line from actual position to end of the line // \033[0m : reset color parameter // \033[1m : use bold for font - Iprintf ("\n"); - if (defaultlanguage == 'F') - { - Iprintf - ("\033[32mPour afficher les commandes, tapez 'Entrée'.\033[0m\n"); - } - else - Iprintf ("\033[32mTo list the commands, type 'enter'.\033[0m\n"); - Iprintf ("\033[0;36mLadmin-> \033[0m"); - Iprintf ("\033[1m"); - fflush (stdout); + Iprintf("\n"); + Iprintf("\033[32mTo list the commands, type 'enter'.\033[0m\n"); + Iprintf("\033[0;36mLadmin-> \033[0m"); + Iprintf("\033[1m"); + fflush(stdout); // get command and parameter - memset (buf, '\0', sizeof (buf)); - fflush (stdin); - if (!fgets (buf, 1023, stdin)) - exit (0); + memset(buf, '\0', sizeof(buf)); + fflush(stdin); + if (!fgets(buf, 1023, stdin)) + exit(0); buf[1023] = '\0'; - Iprintf ("\033[0m"); - fflush (stdout); + Iprintf("\033[0m"); + fflush(stdout); - if (!eathena_interactive_session && !strlen (buf)) - exit (0); + if (!eathena_interactive_session && !strlen(buf)) + exit(0); // remove final \n - if ((p = strrchr (buf, '\n')) != NULL) + if ((p = strrchr(buf, '\n')) != NULL) p[0] = '\0'; // remove all control char for (i = 0; buf[i]; i++) if (buf[i] < 32) { // remove cursor control. - if (buf[i] == 27 && buf[i + 1] == '[' && (buf[i + 2] == 'H' || // home position (cursor) - buf[i + 2] == 'J' || // clear screen - buf[i + 2] == 'A' || // up 1 line - buf[i + 2] == 'B' || // down 1 line - buf[i + 2] == 'C' || // right 1 position - buf[i + 2] == 'D' || // left 1 position - buf[i + 2] == 'G')) - { // center cursor (windows) + if (buf[i] == 27 + && buf[i + 1] == '[' + && (buf[i + 2] == 'H' // home position (cursor) + || buf[i + 2] == 'J' // clear screen + || buf[i + 2] == 'A' // up 1 line + || buf[i + 2] == 'B' // down 1 line + || buf[i + 2] == 'C' // right 1 position + || buf[i + 2] == 'D' // left 1 position + || buf[i + 2] == 'G')) // center cursor (windows) + { for (j = i; buf[j]; j++) buf[j] = buf[j + 3]; } else if (buf[i] == 27 && buf[i + 1] == '[' && buf[i + 2] == '2' && buf[i + 3] == 'J') - { // clear screen + { + // clear screen for (j = i; buf[j]; j++) buf[j] = buf[j + 4]; } - else if (buf[i] == 27 && buf[i + 1] == '[' && buf[i + 3] == '~' && (buf[i + 2] == '1' || // home (windows) - buf[i + 2] == '2' || // insert (windows) - buf[i + 2] == '3' || // del (windows) - buf[i + 2] == '4' || // end (windows) - buf[i + 2] == '5' || // pgup (windows) - buf - [i - + - 2] - == - '6')) - { // pgdown (windows) + else if (buf[i] == 27 + && buf[i + 1] == '[' + && buf[i + 3] == '~' + && (buf[i + 2] == '1' // home (windows) + || buf[i + 2] == '2' // insert (windows) + || buf[i + 2] == '3' // del (windows) + || buf[i + 2] == '4' // end (windows) + || buf[i + 2] == '5' // pgup (windows) + || buf[i + 2] == '6')) // pgdown (windows) + { for (j = i; buf[j]; j++) buf[j] = buf[j + 4]; } @@ -4324,236 +2500,190 @@ int prompt (void) i--; } + char command[1024]; // extract command name and parameters - memset (command, '\0', sizeof (command)); - memset (parameters, '\0', sizeof (parameters)); - sscanf (buf, "%1023s %[^\n]", command, parameters); + memset(command, '\0', sizeof(command)); + memset(parameters, '\0', sizeof(parameters)); + sscanf(buf, "%1023s %[^\n]", command, parameters); command[1023] = '\0'; parameters[1023] = '\0'; // lowercase for command line for (i = 0; command[i]; i++) - command[i] = tolower (command[i]); + command[i] = tolower(command[i]); - if (command[0] == '?' || strlen (command) == 0) + if (command[0] == '?' || strlen(command) == 0) { - if (defaultlanguage == 'F') - { - strcpy (buf, "aide"); - strcpy (command, "aide"); - } - else - { - strcpy (buf, "help"); - strcpy (command, "help"); - } + strcpy(buf, "help"); + strcpy(command, "help"); } // Analyse of the command - check_command (command); // give complete name to the command + check_command(command); // give complete name to the command - if (strlen (parameters) == 0) + if (strlen(parameters) == 0) { - if (defaultlanguage == 'F') - { - ladmin_log ("Commande: '%s' (sans paramètre)\n", - command, parameters); - } - else - { - ladmin_log ("Command: '%s' (without parameters)\n", - command, parameters); - } + LADMIN_LOG("Command: '%s' (without parameters)\n", + command); } else { - if (defaultlanguage == 'F') - { - ladmin_log ("Commande: '%s', paramètres: '%s'\n", - command, parameters); - } - else - { - ladmin_log ("Command: '%s', parameters: '%s'\n", - command, parameters); - } + LADMIN_LOG("Command: '%s', parameters: '%s'\n", + command, parameters); } // Analyse of the command // help - if (strcmp (command, "aide") == 0) - { - display_help (parameters, 1); // 1: french - } - else if (strcmp (command, "help") == 0) + if (strcmp(command, "help") == 0) { - display_help (parameters, 0); // 0: english + display_help(parameters); // general commands } - else if (strcmp (command, "add") == 0) - { - addaccount (parameters, 0); // 0: no email - } - else if (strcmp (command, "ban") == 0) + else if (strcmp(command, "add") == 0) { - banaccount (parameters); + addaccount(parameters, 0); // 0: no email } - else if (strcmp (command, "banadd") == 0) + else if (strcmp(command, "ban") == 0) { - banaddaccount (parameters); + banaccount(parameters); } - else if (strcmp (command, "banset") == 0) + else if (strcmp(command, "banadd") == 0) { - bansetaccount (parameters); + banaddaccount(parameters); } - else if (strcmp (command, "block") == 0) + else if (strcmp(command, "banset") == 0) { - blockaccount (parameters); + bansetaccount(parameters); } - else if (strcmp (command, "check") == 0) + else if (strcmp(command, "block") == 0) { - checkaccount (parameters); + blockaccount(parameters); } - else if (strcmp (command, "create") == 0) + else if (strcmp(command, "check") == 0) { - addaccount (parameters, 1); // 1: with email + checkaccount(parameters); } - else if (strcmp (command, "delete") == 0) + else if (strcmp(command, "create") == 0) { - delaccount (parameters); + addaccount(parameters, 1); // 1: with email } - else if (strcmp (command, "email") == 0) + else if (strcmp(command, "delete") == 0) { - changeemail (parameters); + delaccount(parameters); } - else if (strcmp (command, "getcount") == 0) + else if (strcmp(command, "email") == 0) { - getlogincount (); + changeemail(parameters); } - else if (strcmp (command, "gm") == 0) + else if (strcmp(command, "getcount") == 0) { - changegmlevel (parameters); + getlogincount(); } - else if (strcmp (command, "id") == 0) + else if (strcmp(command, "gm") == 0) { - idaccount (parameters); + changegmlevel(parameters); } - else if (strcmp (command, "info") == 0) + else if (strcmp(command, "id") == 0) { - infoaccount (atoi (parameters)); + idaccount(parameters); } - else if (strcmp (command, "kami") == 0) + else if (strcmp(command, "info") == 0) { - sendbroadcast (0, parameters); // flag for normal + infoaccount(atoi(parameters)); } - else if (strcmp (command, "kamib") == 0) + else if (strcmp(command, "kami") == 0) { - sendbroadcast (0x10, parameters); // flag for blue + sendbroadcast(0, parameters); // flag for normal } - else if (strcmp (command, "language") == 0) + else if (strcmp(command, "kamib") == 0) { - changelanguage (parameters); + sendbroadcast(0x10, parameters); // flag for blue } - else if (strcmp (command, "itemfrob") == 0) + else if (strcmp(command, "itemfrob") == 0) { - itemfrob (parameters); // 0: to list all + itemfrob(parameters); // 0: to list all } - else if (strcmp (command, "list") == 0) + else if (strcmp(command, "list") == 0) { - listaccount (parameters, 0); // 0: to list all + listaccount(parameters, 0); // 0: to list all } - else if (strcmp (command, "listban") == 0) + else if (strcmp(command, "listban") == 0) { - listaccount (parameters, 3); // 3: to list only accounts with state or bannished + listaccount(parameters, 3); // 3: to list only accounts with state or bannished } - else if (strcmp (command, "listgm") == 0) + else if (strcmp(command, "listgm") == 0) { - listaccount (parameters, 1); // 1: to list only GM + listaccount(parameters, 1); // 1: to list only GM } - else if (strcmp (command, "listok") == 0) + else if (strcmp(command, "listok") == 0) { - listaccount (parameters, 4); // 4: to list only accounts without state and not bannished + listaccount(parameters, 4); // 4: to list only accounts without state and not bannished } - else if (strcmp (command, "memo") == 0) + else if (strcmp(command, "memo") == 0) { - changememo (parameters); + changememo(parameters); } - else if (strcmp (command, "name") == 0) + else if (strcmp(command, "name") == 0) { - nameaccount (atoi (parameters)); + nameaccount(atoi(parameters)); } - else if (strcmp (command, "password") == 0) + else if (strcmp(command, "password") == 0) { - changepasswd (parameters); + changepasswd(parameters); } - else if (strcmp (command, "reloadgm") == 0) + else if (strcmp(command, "reloadgm") == 0) { - reloadGM (); + reloadGM(parameters); } - else if (strcmp (command, "search") == 0) + else if (strcmp(command, "search") == 0) { // no regex in C version - listaccount (parameters, 2); // 2: to list with pattern + listaccount(parameters, 2); // 2: to list with pattern } - else if (strcmp (command, "sex") == 0) + else if (strcmp(command, "sex") == 0) { - changesex (parameters); + changesex(parameters); } - else if (strcmp (command, "state") == 0) + else if (strcmp(command, "state") == 0) { - changestate (parameters); + changestate(parameters); } - else if (strcmp (command, "timeadd") == 0) + else if (strcmp(command, "timeadd") == 0) { - timeaddaccount (parameters); + timeaddaccount(parameters); } - else if (strcmp (command, "timeset") == 0) + else if (strcmp(command, "timeset") == 0) { - timesetaccount (parameters); + timesetaccount(parameters); } - else if (strcmp (command, "unban") == 0) + else if (strcmp(command, "unban") == 0) { - unbanaccount (parameters); + unbanaccount(parameters); } - else if (strcmp (command, "unblock") == 0) + else if (strcmp(command, "unblock") == 0) { - unblockaccount (parameters); + unblockaccount(parameters); } - else if (strcmp (command, "version") == 0) + else if (strcmp(command, "version") == 0) { - checkloginversion (); + checkloginversion(); } - else if (strcmp (command, "who") == 0) + else if (strcmp(command, "who") == 0) { - whoaccount (parameters); + whoaccount(parameters); // quit } - else if (strcmp (command, "quit") == 0 || - strcmp (command, "exit") == 0 || - strcmp (command, "end") == 0) + else if (strcmp(command, "quit") == 0 || + strcmp(command, "exit") == 0 || + strcmp(command, "end") == 0) { - if (defaultlanguage == 'F') - { - printf ("Au revoir.\n"); - } - else - { - printf ("Bye.\n"); - } - exit (0); + PRINTF("Bye.\n"); + exit(0); // unknown command } else { - if (defaultlanguage == 'F') - { - printf ("Commande inconnue [%s].\n", buf); - ladmin_log ("Commande inconnue [%s].\n", buf); - } - else - { - printf ("Unknown command [%s].\n", buf); - ladmin_log ("Unknown command [%s].\n", buf); - } + PRINTF("Unknown command [%s].\n", buf); + LADMIN_LOG("Unknown command [%s].\n", buf); } } @@ -4564,1646 +2694,870 @@ int prompt (void) // Function: Parse receiving informations from the login-server //------------------------------------------------------------- static -void parse_fromlogin (int fd) +void parse_fromlogin(int fd) { - struct char_session_data *sd; - if (session[fd]->eof) { - if (defaultlanguage == 'F') - { - printf - ("Impossible de se connecter au serveur de login [%s:%d] !\n", - loginserverip, loginserverport); - ladmin_log - ("Impossible de se connecter au serveur de login [%s:%d] !\n", - loginserverip, loginserverport); - } - else - { - printf - ("Impossible to have a connection with the login-server [%s:%d] !\n", - loginserverip, loginserverport); - ladmin_log - ("Impossible to have a connection with the login-server [%s:%d] !\n", - loginserverip, loginserverport); - } - close (fd); - delete_session (fd); - exit (0); + PRINTF("Impossible to have a connection with the login-server [%s:%d] !\n", + loginserverip, loginserverport); + LADMIN_LOG("Impossible to have a connection with the login-server [%s:%d] !\n", + loginserverip, loginserverport); + delete_session(fd); + exit(0); } -// printf("parse_fromlogin : %d %d %d\n", fd, RFIFOREST(fd), RFIFOW(fd,0)); - sd = (struct char_session_data *)session[fd]->session_data; +// PRINTF("parse_fromlogin : %d %d %d\n", fd, RFIFOREST(fd), RFIFOW(fd,0)); - while (RFIFOREST (fd) >= 2) + while (RFIFOREST(fd) >= 2) { - switch (RFIFOW (fd, 0)) + switch (RFIFOW(fd, 0)) { case 0x7919: // answer of a connection request - if (RFIFOREST (fd) < 3) + if (RFIFOREST(fd) < 3) return; - if (RFIFOB (fd, 2) != 0) + if (RFIFOB(fd, 2) != 0) { - if (defaultlanguage == 'F') - { - printf ("Erreur de login:\n"); - printf (" - mot de passe incorrect,\n"); - printf - (" - système d'administration non activé, ou\n"); - printf (" - IP non autorisée.\n"); - ladmin_log - ("Erreur de login: mot de passe incorrect, système d'administration non activé, ou IP non autorisée.\n"); - } - else - { - printf ("Error at login:\n"); - printf (" - incorrect password,\n"); - printf - (" - administration system not activated, or\n"); - printf (" - unauthorised IP.\n"); - ladmin_log - ("Error at login: incorrect password, administration system not activated, or unauthorised IP.\n"); - } + PRINTF("Error at login:\n"); + PRINTF(" - incorrect password,\n"); + PRINTF(" - administration system not activated, or\n"); + PRINTF(" - unauthorised IP.\n"); + LADMIN_LOG("Error at login: incorrect password, administration system not activated, or unauthorised IP.\n"); session[fd]->eof = 1; //bytes_to_read = 1; // not stop at prompt } else { - if (defaultlanguage == 'F') - { - printf ("Connexion établie.\n"); - ladmin_log ("Connexion établie.\n"); - printf - ("Lecture de la version du serveur de login...\n"); - ladmin_log - ("Lecture de la version du serveur de login...\n"); - } - else - { - Iprintf ("Established connection.\n"); - ladmin_log ("Established connection.\n"); - Iprintf - ("Reading of the version of the login-server...\n"); - ladmin_log - ("Reading of the version of the login-server...\n"); - } + Iprintf("Established connection.\n"); + LADMIN_LOG("Established connection.\n"); + Iprintf("Reading of the version of the login-server...\n"); + LADMIN_LOG("Reading of the version of the login-server...\n"); //bytes_to_read = 1; // unchanged - checkloginversion (); + checkloginversion(); } - RFIFOSKIP (fd, 3); + RFIFOSKIP(fd, 3); break; -#ifdef PASSWORDENC case 0x01dc: // answer of a coding key request - if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2)) + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd, 2)) return; { char md5str[64] = ""; - uint8_t md5bin[32], md5key[RFIFOW (fd, 2) - 4 + 1]; - memcpy (md5key, RFIFOP (fd, 4), RFIFOW (fd, 2) - 4); - md5key[sizeof (md5key) - 1] = '0'; + uint8_t md5bin[32], md5key[RFIFOW(fd, 2) - 4 + 1]; + memcpy(md5key, RFIFOP(fd, 4), RFIFOW(fd, 2) - 4); + md5key[sizeof(md5key) - 1] = '0'; if (passenc == 1) { - strncpy (md5str, (const char *)RFIFOP (fd, 4), RFIFOW (fd, 2) - 4); - strcat (md5str, loginserveradminpassword); + strncpy(md5str, (const char *)RFIFOP(fd, 4), RFIFOW(fd, 2) - 4); + strcat(md5str, loginserveradminpassword); } else if (passenc == 2) { - strncpy (md5str, loginserveradminpassword, - sizeof (loginserveradminpassword)); - strcat (md5str, (const char *)RFIFOP (fd, 4)); + strncpy(md5str, loginserveradminpassword, + sizeof(loginserveradminpassword)); + strcat(md5str, (const char *)RFIFOP(fd, 4)); } MD5_to_bin(MD5_from_cstring(md5str), md5bin); - WFIFOW (login_fd, 0) = 0x7918; // Request for administation login (encrypted password) - WFIFOW (login_fd, 2) = passenc; // Encrypted type - memcpy (WFIFOP (login_fd, 4), md5bin, 16); - WFIFOSET (login_fd, 20); - if (defaultlanguage == 'F') - { - Iprintf ("Réception de la clef MD5.\n"); - ladmin_log ("Réception de la clef MD5.\n"); - Iprintf ("Envoi du mot de passe crypté...\n"); - ladmin_log ("Envoi du mot de passe crypté...\n"); - } - else - { - Iprintf ("Receiving of the MD5 key.\n"); - ladmin_log ("Receiving of the MD5 key.\n"); - Iprintf ("Sending of the encrypted password...\n"); - ladmin_log ("Sending of the encrypted password...\n"); - } + WFIFOW(login_fd, 0) = 0x7918; // Request for administation login (encrypted password) + WFIFOW(login_fd, 2) = passenc; // Encrypted type + memcpy(WFIFOP(login_fd, 4), md5bin, 16); + WFIFOSET(login_fd, 20); + Iprintf("Receiving of the MD5 key.\n"); + LADMIN_LOG("Receiving of the MD5 key.\n"); + Iprintf("Sending of the encrypted password...\n"); + LADMIN_LOG("Sending of the encrypted password...\n"); } bytes_to_read = 1; - RFIFOSKIP (fd, RFIFOW (fd, 2)); + RFIFOSKIP(fd, RFIFOW(fd, 2)); break; -#endif case 0x7531: // Displaying of the version of the login-server - if (RFIFOREST (fd) < 10) + if (RFIFOREST(fd) < 10) return; - Iprintf (" Login-Server [%s:%d]\n", loginserverip, + Iprintf(" Login-Server [%s:%d]\n", loginserverip, loginserverport); - if (((int) RFIFOB (login_fd, 5)) == 0) + if (((int) RFIFOB(login_fd, 5)) == 0) { - Iprintf (" eAthena version stable-%d.%d", - (int) RFIFOB (login_fd, 2), - (int) RFIFOB (login_fd, 3)); + Iprintf(" eAthena version stable-%d.%d", + (int) RFIFOB(login_fd, 2), + (int) RFIFOB(login_fd, 3)); } else { - Iprintf (" eAthena version dev-%d.%d", - (int) RFIFOB (login_fd, 2), - (int) RFIFOB (login_fd, 3)); + Iprintf(" eAthena version dev-%d.%d", + (int) RFIFOB(login_fd, 2), + (int) RFIFOB(login_fd, 3)); } - if (((int) RFIFOB (login_fd, 4)) == 0) - Iprintf (" revision %d", (int) RFIFOB (login_fd, 4)); - if (((int) RFIFOB (login_fd, 6)) == 0) + if (((int) RFIFOB(login_fd, 4)) == 0) + Iprintf(" revision %d", (int) RFIFOB(login_fd, 4)); + if (((int) RFIFOB(login_fd, 6)) == 0) { - Iprintf ("%d.\n", RFIFOW (login_fd, 8)); + Iprintf("%d.\n", RFIFOW(login_fd, 8)); } else - Iprintf ("-mod%d.\n", RFIFOW (login_fd, 8)); + Iprintf("-mod%d.\n", RFIFOW(login_fd, 8)); bytes_to_read = 0; - RFIFOSKIP (fd, 10); + RFIFOSKIP(fd, 10); break; case 0x7925: // Itemfrob-OK - RFIFOSKIP (fd, 2); + RFIFOSKIP(fd, 2); bytes_to_read = 0; break; case 0x7921: // Displaying of the list of accounts - if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2)) + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd, 2)) return; - if (RFIFOW (fd, 2) < 5) + if (RFIFOW(fd, 2) < 5) { - if (defaultlanguage == 'F') + LADMIN_LOG(" Receiving of a void accounts list.\n"); + if (list_count == 0) { - ladmin_log - (" Réception d'une liste des comptes vide.\n"); - if (list_count == 0) - printf ("Aucun compte trouvé.\n"); - else if (list_count == 1) - printf ("1 compte trouvé.\n"); - else - printf ("%d comptes trouvés.\n", list_count); + Iprintf("No account found.\n"); } - else + else if (list_count == 1) { - ladmin_log (" Receiving of a void accounts list.\n"); - if (list_count == 0) - { - Iprintf ("No account found.\n"); - } - else if (list_count == 1) - { - Iprintf ("1 account found.\n"); - } - else - Iprintf ("%d accounts found.\n", list_count); + Iprintf("1 account found.\n"); } + else + Iprintf("%d accounts found.\n", list_count); bytes_to_read = 0; } else { - int i; - if (defaultlanguage == 'F') - ladmin_log (" Réception d'une liste des comptes.\n"); - else - ladmin_log (" Receiving of a accounts list.\n"); - for (i = 4; i < RFIFOW (fd, 2); i += 38) + int i; + LADMIN_LOG(" Receiving of a accounts list.\n"); + for (i = 4; i < RFIFOW(fd, 2); i += 38) { - int j; + int j; char userid[24]; char lower_userid[24]; - memcpy (userid, RFIFOP (fd, i + 5), sizeof (userid)); - userid[sizeof (userid) - 1] = '\0'; - memset (lower_userid, '\0', sizeof (lower_userid)); + memcpy(userid, RFIFOP(fd, i + 5), sizeof(userid)); + userid[sizeof(userid) - 1] = '\0'; + memset(lower_userid, '\0', sizeof(lower_userid)); for (j = 0; userid[j]; j++) - lower_userid[j] = tolower (userid[j]); - list_first = RFIFOL (fd, i) + 1; + lower_userid[j] = tolower(userid[j]); + list_first = RFIFOL(fd, i) + 1; // here are checks... if (list_type == 0 || - (list_type == 1 && RFIFOB (fd, i + 4) > 0) || + (list_type == 1 && RFIFOB(fd, i + 4) > 0) || (list_type == 2 - && strstr (lower_userid, parameters) != NULL) - || (list_type == 3 && RFIFOL (fd, i + 34) != 0) - || (list_type == 4 && RFIFOL (fd, i + 34) == 0)) + && strstr(lower_userid, parameters) != NULL) + ||(list_type == 3 && RFIFOL(fd, i + 34) != 0) + ||(list_type == 4 && RFIFOL(fd, i + 34) == 0)) { - printf ("%10d ", RFIFOL (fd, i)); - if (RFIFOB (fd, i + 4) == 0) - printf (" "); + PRINTF("%10d ", RFIFOL(fd, i)); + if (RFIFOB(fd, i + 4) == 0) + PRINTF(" "); else - printf ("%2d ", (int) RFIFOB (fd, i + 4)); - printf ("%-24s", userid); - if (defaultlanguage == 'F') - { - if (RFIFOB (fd, i + 29) == 0) - printf ("%-5s ", "Femme"); - else if (RFIFOB (fd, i + 29) == 1) - printf ("%-5s ", "Male"); - else - printf ("%-5s ", "Servr"); - } + PRINTF("%2d ", (int) RFIFOB(fd, i + 4)); + PRINTF("%-24s", userid); + if (RFIFOB(fd, i + 29) == 0) + PRINTF("%-5s ", "Femal"); + else if (RFIFOB(fd, i + 29) == 1) + PRINTF("%-5s ", "Male"); else - { - if (RFIFOB (fd, i + 29) == 0) - printf ("%-5s ", "Femal"); - else if (RFIFOB (fd, i + 29) == 1) - printf ("%-5s ", "Male"); - else - printf ("%-5s ", "Servr"); - } - printf ("%6d ", RFIFOL (fd, i + 30)); - switch (RFIFOL (fd, i + 34)) + PRINTF("%-5s ", "Servr"); + PRINTF("%6d ", RFIFOL(fd, i + 30)); + switch (RFIFOL(fd, i + 34)) { case 0: - if (defaultlanguage == 'F') - printf ("%-27s\n", "Compte Ok"); - else - printf ("%-27s\n", "Account OK"); + PRINTF("%-27s\n", "Account OK"); break; case 1: - printf ("%-27s\n", "Unregistered ID"); + PRINTF("%-27s\n", "Unregistered ID"); break; case 2: - printf ("%-27s\n", "Incorrect Password"); + PRINTF("%-27s\n", "Incorrect Password"); break; case 3: - printf ("%-27s\n", "This ID is expired"); + PRINTF("%-27s\n", "This ID is expired"); break; case 4: - printf ("%-27s\n", + PRINTF("%-27s\n", "Rejected from Server"); break; case 5: - printf ("%-27s\n", "Blocked by the GM Team"); // You have been blocked by the GM Team + PRINTF("%-27s\n", "Blocked by the GM Team"); // You have been blocked by the GM Team break; case 6: - printf ("%-27s\n", "Your EXE file is too old"); // Your Game's EXE file is not the latest version + PRINTF("%-27s\n", "Your EXE file is too old"); // Your Game's EXE file is not the latest version break; case 7: - printf ("%-27s\n", "Banishement or"); - printf (" Prohibited to login until...\n"); // You are Prohibited to log in until %s + PRINTF("%-27s\n", "Banishement or"); + PRINTF(" Prohibited to login until...\n"); // You are Prohibited to log in until %s break; case 8: - printf ("%-27s\n", + PRINTF("%-27s\n", "Server is over populated"); break; case 9: - printf ("%-27s\n", "No MSG"); + PRINTF("%-27s\n", "No MSG"); break; default: // 100 - printf ("%-27s\n", "This ID is totally erased"); // This ID has been totally erased + PRINTF("%-27s\n", "This ID is totally erased"); // This ID has been totally erased break; } list_count++; } } // asking of the following acounts - if (defaultlanguage == 'F') - ladmin_log - ("Envoi d'un requête au serveur de logins pour obtenir la liste des comptes de %d à %d (complément).\n", - list_first, list_last); - else - ladmin_log - ("Request to login-server to obtain the list of accounts from %d to %d (complement).\n", - list_first, list_last); - WFIFOW (login_fd, 0) = 0x7920; - WFIFOL (login_fd, 2) = list_first; - WFIFOL (login_fd, 6) = list_last; - WFIFOSET (login_fd, 10); + LADMIN_LOG("Request to login-server to obtain the list of accounts from %d to %d (complement).\n", + list_first, list_last); + WFIFOW(login_fd, 0) = 0x7920; + WFIFOL(login_fd, 2) = list_first; + WFIFOL(login_fd, 6) = list_last; + WFIFOSET(login_fd, 10); bytes_to_read = 1; } - RFIFOSKIP (fd, RFIFOW (fd, 2)); + RFIFOSKIP(fd, RFIFOW(fd, 2)); break; case 0x7931: // Answer of login-server about an account creation - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec à la création du compte [%s]. Un compte identique existe déjà.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec à la création du compte [%s]. Un compte identique existe déjà.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] creation failed. Same account already exists.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] creation failed. Same account already exists.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] creation failed. Same account already exists.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] creation failed. Same account already exists.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf ("Compte [%s] créé avec succès [id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log ("Compte [%s] créé avec succès [id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Account [%s] is successfully created [id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Account [%s] is successfully created [id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Account [%s] is successfully created [id: %d].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Account [%s] is successfully created [id: %d].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7933: // Answer of login-server about an account deletion - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec de la suppression du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec de la suppression du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] deletion failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] deletion failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] deletion failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] deletion failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf ("Compte [%s][id: %d] SUPPRIME avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Compte [%s][id: %d] SUPPRIME avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Account [%s][id: %d] is successfully DELETED.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Account [%s][id: %d] is successfully DELETED.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Account [%s][id: %d] is successfully DELETED.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Account [%s][id: %d] is successfully DELETED.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7935: // answer of the change of an account password - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec de la modification du mot de passe du compte [%s].\n", - RFIFOP (fd, 6)); - printf ("Le compte [%s] n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec de la modification du mot de passe du compte. Le compte [%s] n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf ("Account [%s] password changing failed.\n", - RFIFOP (fd, 6)); - printf ("Account [%s] doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account password changing failed. The compte [%s] doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] password changing failed.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + PRINTF("Account [%s] doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account password changing failed. The compte [%s] doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf - ("Modification du mot de passe du compte [%s][id: %d] réussie.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Modification du mot de passe du compte [%s][id: %d] réussie.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Account [%s][id: %d] password successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Account [%s][id: %d] password successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Account [%s][id: %d] password successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Account [%s][id: %d] password successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7937: // answer of the change of an account state - if (RFIFOREST (fd) < 34) + if (RFIFOREST(fd) < 34) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec du changement du statut du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec du changement du statut du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] state changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] state changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] state changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] state changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - char tmpstr[256]; - if (defaultlanguage == 'F') - { - sprintf (tmpstr, - "Statut du compte [%s] changé avec succès en [", - RFIFOP (fd, 6)); - } - else - { - sprintf (tmpstr, - "Account [%s] state successfully changed in [", - RFIFOP (fd, 6)); - } - switch (RFIFOL (fd, 30)) + std::string tmpstr = STRPRINTF( + "Account [%s] state successfully changed in [", + static_cast<const char *>(RFIFOP(fd, 6))); + switch (RFIFOL(fd, 30)) { case 0: - if (defaultlanguage == 'F') - strcat (tmpstr, "0: Compte Ok"); - else - strcat (tmpstr, "0: Account OK"); + tmpstr += "0: Account OK"; break; case 1: - strcat (tmpstr, "1: Unregistered ID"); + tmpstr += "1: Unregistered ID"; break; case 2: - strcat (tmpstr, "2: Incorrect Password"); + tmpstr += "2: Incorrect Password"; break; case 3: - strcat (tmpstr, "3: This ID is expired"); + tmpstr += "3: This ID is expired"; break; case 4: - strcat (tmpstr, "4: Rejected from Server"); + tmpstr += "4: Rejected from Server"; break; case 5: - strcat (tmpstr, - "5: You have been blocked by the GM Team"); + tmpstr += "5: You have been blocked by the GM Team"; break; case 6: - strcat (tmpstr, - "6: [Your Game's EXE file is not the latest version"); + tmpstr += "6: [Your Game's EXE file is not the latest version"; break; case 7: - strcat (tmpstr, - "7: You are Prohibited to log in until..."); + tmpstr += "7: You are Prohibited to log in until..."; break; case 8: - strcat (tmpstr, - "8: Server is jammed due to over populated"); + tmpstr += "8: Server is jammed due to over populated"; break; case 9: - strcat (tmpstr, "9: No MSG"); + tmpstr += "9: No MSG"; break; default: // 100 - strcat (tmpstr, "100: This ID is totally erased"); + tmpstr += "100: This ID is totally erased"; break; } - strcat (tmpstr, "]"); - printf ("%s\n", tmpstr); - ladmin_log ("%s%s", tmpstr, "\n"); + tmpstr += ']'; + PRINTF("%s\n", tmpstr); + LADMIN_LOG("%s\n", tmpstr); } bytes_to_read = 0; - RFIFOSKIP (fd, 34); + RFIFOSKIP(fd, 34); break; case 0x7939: // answer of the number of online players - if (RFIFOREST (fd) < 4 || RFIFOREST (fd) < RFIFOW (fd, 2)) + if (RFIFOREST(fd) < 4 || RFIFOREST(fd) < RFIFOW(fd, 2)) return; { // Get length of the received packet - int i; + int i; char name[20]; - if (defaultlanguage == 'F') - { - ladmin_log - (" Réception du nombre de joueurs en ligne.\n"); - } - else - { - ladmin_log - (" Receiving of the number of online players.\n"); - } + LADMIN_LOG(" Receiving of the number of online players.\n"); // Read information of the servers - if (RFIFOW (fd, 2) < 5) + if (RFIFOW(fd, 2) < 5) { - if (defaultlanguage == 'F') - { - printf - (" Aucun serveur n'est connecté au login serveur.\n"); - } - else - { - printf - (" No server is connected to the login-server.\n"); - } + PRINTF(" No server is connected to the login-server.\n"); } else { - if (defaultlanguage == 'F') - { - printf - (" Nombre de joueurs en ligne (serveur: nb):\n"); - } - else - { - printf - (" Number of online players (server: number).\n"); - } + PRINTF(" Number of online players (server: number).\n"); // Displaying of result - for (i = 4; i < RFIFOW (fd, 2); i += 32) + for (i = 4; i < RFIFOW(fd, 2); i += 32) { - memcpy (name, RFIFOP (fd, i + 6), sizeof (name)); - name[sizeof (name) - 1] = '\0'; - printf (" %-20s : %5d\n", name, - RFIFOW (fd, i + 26)); + memcpy(name, RFIFOP(fd, i + 6), sizeof(name)); + name[sizeof(name) - 1] = '\0'; + PRINTF(" %-20s : %5d\n", name, + RFIFOW(fd, i + 26)); } } } bytes_to_read = 0; - RFIFOSKIP (fd, RFIFOW (fd, 2)); + RFIFOSKIP(fd, RFIFOW(fd, 2)); break; case 0x793b: // answer of the check of a password - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Le compte [%s] n'existe pas ou le mot de passe est incorrect.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Le compte [%s] n'existe pas ou le mot de passe est incorrect.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("The account [%s] doesn't exist or the password is incorrect.\n", - RFIFOP (fd, 6)); - ladmin_log - ("The account [%s] doesn't exist or the password is incorrect.\n", - RFIFOP (fd, 6)); - } + PRINTF("The account [%s] doesn't exist or the password is incorrect.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("The account [%s] doesn't exist or the password is incorrect.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf - ("Le mot de passe donné correspond bien au compte [%s][id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Le mot de passe donné correspond bien au compte [%s][id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("The proposed password is correct for the account [%s][id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("The proposed password is correct for the account [%s][id: %d].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("The proposed password is correct for the account [%s][id: %d].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("The proposed password is correct for the account [%s][id: %d].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x793d: // answer of the change of an account sex - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec de la modification du sexe du compte [%s].\n", - RFIFOP (fd, 6)); - printf - ("Le compte [%s] n'existe pas ou le sexe est déjà celui demandé.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec de la modification du sexe du compte. Le compte [%s] n'existe pas ou le sexe est déjà celui demandé.\n", - RFIFOP (fd, 6)); - } - else - { - printf ("Account [%s] sex changing failed.\n", - RFIFOP (fd, 6)); - printf - ("Account [%s] doesn't exist or the sex is already the good sex.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account sex changing failed. The compte [%s] doesn't exist or the sex is already the good sex.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] sex changing failed.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + PRINTF("Account [%s] doesn't exist or the sex is already the good sex.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account sex changing failed. The compte [%s] doesn't exist or the sex is already the good sex.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf - ("Sexe du compte [%s][id: %d] changé avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Sexe du compte [%s][id: %d] changé avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Account [%s][id: %d] sex successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Account [%s][id: %d] sex successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Account [%s][id: %d] sex successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Account [%s][id: %d] sex successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x793f: // answer of the change of an account GM level - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec de la modification du niveau de GM du compte [%s].\n", - RFIFOP (fd, 6)); - printf - ("Le compte [%s] n'existe pas, le niveau de GM est déjà celui demandé\n", - RFIFOP (fd, 6)); - printf - ("ou il est impossible de modifier le fichier des comptes GM.\n"); - ladmin_log - ("Echec de la modification du niveau de GM du compte. Le compte [%s] n'existe pas, le niveau de GM est déjà celui demandé ou il est impossible de modifier le fichier des comptes GM.\n", - RFIFOP (fd, 6)); - } - else - { - printf ("Account [%s] GM level changing failed.\n", - RFIFOP (fd, 6)); - printf - ("Account [%s] doesn't exist, the GM level is already the good GM level\n", - RFIFOP (fd, 6)); - printf - ("or it's impossible to modify the GM accounts file.\n"); - ladmin_log - ("Account GM level changing failed. The compte [%s] doesn't exist, the GM level is already the good sex or it's impossible to modify the GM accounts file.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] GM level changing failed.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + PRINTF("Account [%s] doesn't exist, the GM level is already the good GM level\n", + static_cast<const char *>(RFIFOP(fd, 6))); + PRINTF("or it's impossible to modify the GM accounts file.\n"); + LADMIN_LOG("Account GM level changing failed. The compte [%s] doesn't exist, the GM level is already the good sex or it's impossible to modify the GM accounts file.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf - ("Niveau de GM du compte [%s][id: %d] changé avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Niveau de GM du compte [%s][id: %d] changé avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Account [%s][id: %d] GM level successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Account [%s][id: %d] GM level successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Account [%s][id: %d] GM level successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Account [%s][id: %d] GM level successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7941: // answer of the change of an account email - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec de la modification de l'e-mail du compte [%s].\n", - RFIFOP (fd, 6)); - printf ("Le compte [%s] n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec de la modification de l'e-mail du compte. Le compte [%s] n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf ("Account [%s] e-mail changing failed.\n", - RFIFOP (fd, 6)); - printf ("Account [%s] doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account e-mail changing failed. The compte [%s] doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] e-mail changing failed.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + PRINTF("Account [%s] doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account e-mail changing failed. The compte [%s] doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf - ("Modification de l'e-mail du compte [%s][id: %d] réussie.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Modification de l'e-mail du compte [%s][id: %d] réussie.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Account [%s][id: %d] e-mail successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Account [%s][id: %d] e-mail successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Account [%s][id: %d] e-mail successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Account [%s][id: %d] e-mail successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7943: // answer of the change of an account memo - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec du changement du mémo du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec du changement du mémo du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] memo changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] memo changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] memo changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] memo changing failed. Account doesn't exist.\n", + + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf - ("Mémo du compte [%s][id: %d] changé avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Mémo du compte [%s][id: %d] changé avec succès.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Account [%s][id: %d] memo successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Account [%s][id: %d] memo successfully changed.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Account [%s][id: %d] memo successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Account [%s][id: %d] memo successfully changed.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7945: // answer of an account id search - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Impossible de trouver l'id du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Impossible de trouver l'id du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Unable to find the account [%s] id. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Unable to find the account [%s] id. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Unable to find the account [%s] id. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Unable to find the account [%s] id. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - if (defaultlanguage == 'F') - { - printf ("Le compte [%s] a pour id: %d.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log ("Le compte [%s] a pour id: %d.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf ("The account [%s] have the id: %d.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log ("The account [%s] have the id: %d.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("The account [%s] have the id: %d.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("The account [%s] have the id: %d.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7947: // answer of an account name search - if (RFIFOREST (fd) < 30) + if (RFIFOREST(fd) < 30) return; - if (strcmp ((const char *)RFIFOP (fd, 6), "") == 0) + if (strcmp((const char *)RFIFOP(fd, 6), "") == 0) { - if (defaultlanguage == 'F') - { - printf - ("Impossible de trouver le nom du compte [%d]. Le compte n'existe pas.\n", - RFIFOL (fd, 2)); - ladmin_log - ("Impossible de trouver le nom du compte [%d]. Le compte n'existe pas.\n", - RFIFOL (fd, 2)); - } - else - { - printf - ("Unable to find the account [%d] name. Account doesn't exist.\n", - RFIFOL (fd, 2)); - ladmin_log - ("Unable to find the account [%d] name. Account doesn't exist.\n", - RFIFOL (fd, 2)); - } + PRINTF("Unable to find the account [%d] name. Account doesn't exist.\n", + RFIFOL(fd, 2)); + LADMIN_LOG("Unable to find the account [%d] name. Account doesn't exist.\n", + RFIFOL(fd, 2)); } else { - if (defaultlanguage == 'F') - { - printf ("Le compte [id: %d] a pour nom: %s.\n", - RFIFOL (fd, 2), RFIFOP (fd, 6)); - ladmin_log ("Le compte [id: %d] a pour nom: %s.\n", - RFIFOL (fd, 2), RFIFOP (fd, 6)); - } - else - { - printf ("The account [id: %d] have the name: %s.\n", - RFIFOL (fd, 2), RFIFOP (fd, 6)); - ladmin_log ("The account [id: %d] have the name: %s.\n", - RFIFOL (fd, 2), RFIFOP (fd, 6)); - } + PRINTF("The account [id: %d] have the name: %s.\n", + RFIFOL(fd, 2), static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("The account [id: %d] have the name: %s.\n", + RFIFOL(fd, 2), static_cast<const char *>(RFIFOP(fd, 6))); } bytes_to_read = 0; - RFIFOSKIP (fd, 30); + RFIFOSKIP(fd, 30); break; case 0x7949: // answer of an account validity limit set - if (RFIFOREST (fd) < 34) + if (RFIFOREST(fd) < 34) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec du changement de la validité du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec du changement de la validité du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] validity limit changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] validity limit changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] validity limit changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] validity limit changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - time_t timestamp = RFIFOL (fd, 30); - if (timestamp == 0) + TimeT timestamp = static_cast<time_t>(RFIFOL(fd, 30)); + if (!timestamp) { - if (defaultlanguage == 'F') - { - printf - ("Limite de validité du compte [%s][id: %d] changée avec succès en [illimité].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Limite de validité du compte [%s][id: %d] changée avec succès en [illimité].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Validity Limit of the account [%s][id: %d] successfully changed to [unlimited].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } else { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (×tamp)); - if (defaultlanguage == 'F') - { - printf - ("Limite de validité du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Limite de validité du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } - else - { - printf - ("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } + timestamp_seconds_buffer tmpstr; + stamp_time(tmpstr, ×tamp); + PRINTF("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2), tmpstr); + LADMIN_LOG("Validity Limit of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2), + tmpstr); } } bytes_to_read = 0; - RFIFOSKIP (fd, 34); + RFIFOSKIP(fd, 34); break; case 0x794b: // answer of an account ban set - if (RFIFOREST (fd) < 34) + if (RFIFOREST(fd) < 34) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - time_t timestamp = RFIFOL (fd, 30); - if (timestamp == 0) + TimeT timestamp = static_cast<time_t>(RFIFOL(fd, 30)); + if (!timestamp) { - if (defaultlanguage == 'F') - { - printf - ("Date finale de banissement du compte [%s][id: %d] changée avec succès en [dé-bannie].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Date finale de banissement du compte [%s][id: %d] changée avec succès en [dé-bannie].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } else { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (×tamp)); - if (defaultlanguage == 'F') - { - printf - ("Date finale de banissement du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Date finale de banissement du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } - else - { - printf - ("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } + timestamp_seconds_buffer tmpstr; + stamp_time(tmpstr, ×tamp); + PRINTF("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2), tmpstr); + LADMIN_LOG("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2), + tmpstr); } } bytes_to_read = 0; - RFIFOSKIP (fd, 34); + RFIFOSKIP(fd, 34); break; case 0x794d: // answer of an account ban date/time changing - if (RFIFOREST (fd) < 34) + if (RFIFOREST(fd) < 34) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec du changement de la date finale de banissement du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] final date of banishment changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - time_t timestamp = RFIFOL (fd, 30); - if (timestamp == 0) + TimeT timestamp = static_cast<time_t>(RFIFOL(fd, 30)); + if (!timestamp) { - if (defaultlanguage == 'F') - { - printf - ("Date finale de banissement du compte [%s][id: %d] changée avec succès en [dé-bannie].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Date finale de banissement du compte [%s][id: %d] changée avec succès en [dé-bannie].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - ladmin_log - ("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + LADMIN_LOG("Final date of banishment of the account [%s][id: %d] successfully changed to [unbanished].\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } else { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (×tamp)); - if (defaultlanguage == 'F') - { - printf - ("Date finale de banissement du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Date finale de banissement du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } - else - { - printf - ("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } + timestamp_seconds_buffer tmpstr; + stamp_time(tmpstr, ×tamp); + PRINTF("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2), + tmpstr); + LADMIN_LOG("Final date of banishment of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2), + tmpstr); } } bytes_to_read = 0; - RFIFOSKIP (fd, 34); + RFIFOSKIP(fd, 34); break; case 0x794f: // answer of a broadcast - if (RFIFOREST (fd) < 4) + if (RFIFOREST(fd) < 4) return; - if (RFIFOW (fd, 2) == (unsigned short) -1) + if (RFIFOW(fd, 2) == (unsigned short) -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec de l'envoi du message. Aucun server de char en ligne.\n"); - ladmin_log - ("Echec de l'envoi du message. Aucun server de char en ligne.\n"); - } - else - { - printf - ("Message sending failed. No online char-server.\n"); - ladmin_log - ("Message sending failed. No online char-server.\n"); - } + PRINTF("Message sending failed. No online char-server.\n"); + LADMIN_LOG("Message sending failed. No online char-server.\n"); } else { - if (defaultlanguage == 'F') - { - printf - ("Message transmis au server de logins avec succès.\n"); - ladmin_log - ("Message transmis au server de logins avec succès.\n"); - } - else - { - printf - ("Message successfully sended to login-server.\n"); - ladmin_log - ("Message successfully sended to login-server.\n"); - } + PRINTF("Message successfully sended to login-server.\n"); + LADMIN_LOG("Message successfully sended to login-server.\n"); } bytes_to_read = 0; - RFIFOSKIP (fd, 4); + RFIFOSKIP(fd, 4); break; case 0x7951: // answer of an account validity limit changing - if (RFIFOREST (fd) < 34) + if (RFIFOREST(fd) < 34) return; - if (RFIFOL (fd, 2) == -1) + if (RFIFOL(fd, 2) == -1) { - if (defaultlanguage == 'F') - { - printf - ("Echec du changement de la validité du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Echec du changement de la validité du compte [%s]. Le compte n'existe pas.\n", - RFIFOP (fd, 6)); - } - else - { - printf - ("Account [%s] validity limit changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - ladmin_log - ("Account [%s] validity limit changing failed. Account doesn't exist.\n", - RFIFOP (fd, 6)); - } + PRINTF("Account [%s] validity limit changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); + LADMIN_LOG("Account [%s] validity limit changing failed. Account doesn't exist.\n", + static_cast<const char *>(RFIFOP(fd, 6))); } else { - time_t timestamp = RFIFOL (fd, 30); - if (timestamp == 0) + TimeT timestamp = static_cast<time_t>(RFIFOL(fd, 30)); + if (!timestamp) { - if (defaultlanguage == 'F') - { - printf - ("Limite de validité du compte [%s][id: %d] inchangée.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - printf - ("Le compte a une validité illimitée ou\n"); - printf - ("la modification est impossible avec les ajustements demandés.\n"); - ladmin_log - ("Limite de validité du compte [%s][id: %d] inchangée. Le compte a une validité illimitée ou la modification est impossible avec les ajustements demandés.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } - else - { - printf - ("Validity limit of the account [%s][id: %d] unchanged.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - printf - ("The account have an unlimited validity limit or\n"); - printf - ("the changing is impossible with the proposed adjustments.\n"); - ladmin_log - ("Validity limit of the account [%s][id: %d] unchanged. The account have an unlimited validity limit or the changing is impossible with the proposed adjustments.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2)); - } + PRINTF("Validity limit of the account [%s][id: %d] unchanged.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); + PRINTF("The account have an unlimited validity limit or\n"); + PRINTF("the changing is impossible with the proposed adjustments.\n"); + LADMIN_LOG("Validity limit of the account [%s][id: %d] unchanged. The account have an unlimited validity limit or the changing is impossible with the proposed adjustments.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2)); } else { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (×tamp)); - if (defaultlanguage == 'F') - { - printf - ("Limite de validité du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Limite de validité du compte [%s][id: %d] changée avec succès pour être jusqu'au %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } - else - { - printf - ("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), tmpstr); - ladmin_log - ("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", - RFIFOP (fd, 6), RFIFOL (fd, 2), - tmpstr); - } + timestamp_seconds_buffer tmpstr; + stamp_time(tmpstr, ×tamp); + PRINTF("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>(RFIFOP(fd, 6)), RFIFOL(fd, 2), + tmpstr); + LADMIN_LOG("Validity limit of the account [%s][id: %d] successfully changed to be until %s.\n", + static_cast<const char *>( RFIFOP(fd, 6)), RFIFOL(fd, 2), + tmpstr); } } bytes_to_read = 0; - RFIFOSKIP (fd, 34); + RFIFOSKIP(fd, 34); break; case 0x7953: // answer of a request about informations of an account (by account name/id) - if (RFIFOREST (fd) < 150 - || RFIFOREST (fd) < (150 + RFIFOW (fd, 148))) + if (RFIFOREST(fd) < 150 + || RFIFOREST(fd) < (150 + RFIFOW(fd, 148))) return; { char userid[24], error_message[20], lastlogin[24], last_ip[16], email[40], memo[255]; - time_t ban_until_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban) - time_t connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) - memcpy (userid, RFIFOP (fd, 7), sizeof (userid)); - userid[sizeof (userid) - 1] = '\0'; - memcpy (error_message, RFIFOP (fd, 40), - sizeof (error_message)); - error_message[sizeof (error_message) - 1] = '\0'; - memcpy (lastlogin, RFIFOP (fd, 60), sizeof (lastlogin)); - lastlogin[sizeof (lastlogin) - 1] = '\0'; - memcpy (last_ip, RFIFOP (fd, 84), sizeof (last_ip)); - last_ip[sizeof (last_ip) - 1] = '\0'; - memcpy (email, RFIFOP (fd, 100), sizeof (email)); - email[sizeof (email) - 1] = '\0'; - connect_until_time = (time_t) RFIFOL (fd, 140); - ban_until_time = (time_t) RFIFOL (fd, 144); - memset (memo, '\0', sizeof (memo)); - strncpy (memo, (const char *)RFIFOP (fd, 150), RFIFOW (fd, 148)); - if (RFIFOL (fd, 2) == -1) - { - if (defaultlanguage == 'F') - { - printf - ("Impossible de trouver le compte [%s]. Le compte n'existe pas.\n", - parameters); - ladmin_log - ("Impossible de trouver le compte [%s]. Le compte n'existe pas.\n", - parameters); - } - else - { - printf - ("Unabled to find the account [%s]. Account doesn't exist.\n", - parameters); - ladmin_log - ("Unabled to find the account [%s]. Account doesn't exist.\n", - parameters); - } - } - else if (strlen (userid) == 0) - { - if (defaultlanguage == 'F') - { - printf - ("Impossible de trouver le compte [id: %s]. Le compte n'existe pas.\n", - parameters); - ladmin_log - ("Impossible de trouver le compte [id: %s]. Le compte n'existe pas.\n", - parameters); - } - else - { - printf - ("Unabled to find the account [id: %s]. Account doesn't exist.\n", - parameters); - ladmin_log - ("Unabled to find the account [id: %s]. Account doesn't exist.\n", - parameters); - } + TimeT ban_until_time; // # of seconds 1/1/1970 (timestamp): ban time limit of the account (0 = no ban) + TimeT connect_until_time; // # of seconds 1/1/1970 (timestamp): Validity limit of the account (0 = unlimited) + memcpy(userid, RFIFOP(fd, 7), sizeof(userid)); + userid[sizeof(userid) - 1] = '\0'; + memcpy(error_message, RFIFOP(fd, 40), + sizeof(error_message)); + error_message[sizeof(error_message) - 1] = '\0'; + memcpy(lastlogin, RFIFOP(fd, 60), sizeof(lastlogin)); + lastlogin[sizeof(lastlogin) - 1] = '\0'; + memcpy(last_ip, RFIFOP(fd, 84), sizeof(last_ip)); + last_ip[sizeof(last_ip) - 1] = '\0'; + memcpy(email, RFIFOP(fd, 100), sizeof(email)); + email[sizeof(email) - 1] = '\0'; + connect_until_time = static_cast<time_t>(RFIFOL(fd, 140)); + ban_until_time = static_cast<time_t>(RFIFOL(fd, 144)); + memset(memo, '\0', sizeof(memo)); + strncpy(memo, (const char *)RFIFOP(fd, 150), RFIFOW(fd, 148)); + if (RFIFOL(fd, 2) == -1) + { + PRINTF("Unabled to find the account [%s]. Account doesn't exist.\n", + parameters); + LADMIN_LOG("Unabled to find the account [%s]. Account doesn't exist.\n", + parameters); + } + else if (strlen(userid) == 0) + { + PRINTF("Unabled to find the account [id: %s]. Account doesn't exist.\n", + parameters); + LADMIN_LOG("Unabled to find the account [id: %s]. Account doesn't exist.\n", + parameters); } else { - if (defaultlanguage == 'F') - { - ladmin_log - ("Réception d'information concernant un compte.\n"); - printf - ("Le compte a les caractéristiques suivantes:\n"); - } - else + LADMIN_LOG("Receiving information about an account.\n"); + PRINTF("The account is set with:\n"); + if (RFIFOB(fd, 6) == 0) { - ladmin_log - ("Receiving information about an account.\n"); - printf ("The account is set with:\n"); - } - if (RFIFOB (fd, 6) == 0) - { - printf (" Id: %d (non-GM)\n", RFIFOL (fd, 2)); + PRINTF(" Id: %d (non-GM)\n", RFIFOL(fd, 2)); } else { - if (defaultlanguage == 'F') - { - printf (" Id: %d (GM niveau %d)\n", - RFIFOL (fd, 2), (int) RFIFOB (fd, 6)); - } - else - { - printf (" Id: %d (GM level %d)\n", - RFIFOL (fd, 2), (int) RFIFOB (fd, 6)); - } - } - if (defaultlanguage == 'F') - { - printf (" Nom: '%s'\n", userid); - if (RFIFOB (fd, 31) == 0) - printf (" Sexe: Femme\n"); - else if (RFIFOB (fd, 31) == 1) - printf (" Sexe: Male\n"); - else - printf (" Sexe: Serveur\n"); + PRINTF(" Id: %d (GM level %d)\n", + RFIFOL(fd, 2), (int) RFIFOB(fd, 6)); } + PRINTF(" Name: '%s'\n", userid); + if (RFIFOB(fd, 31) == 0) + PRINTF(" Sex: Female\n"); + else if (RFIFOB(fd, 31) == 1) + PRINTF(" Sex: Male\n"); else - { - printf (" Name: '%s'\n", userid); - if (RFIFOB (fd, 31) == 0) - printf (" Sex: Female\n"); - else if (RFIFOB (fd, 31) == 1) - printf (" Sex: Male\n"); - else - printf (" Sex: Server\n"); - } - printf (" E-mail: %s\n", email); - switch (RFIFOL (fd, 36)) + PRINTF(" Sex: Server\n"); + PRINTF(" E-mail: %s\n", email); + switch (RFIFOL(fd, 36)) { case 0: - if (defaultlanguage == 'F') - printf (" Statut: 0 [Compte Ok]\n"); - else - printf (" Statut: 0 [Account OK]\n"); + PRINTF(" Statut: 0 [Account OK]\n"); break; case 1: - printf (" Statut: 1 [Unregistered ID]\n"); + PRINTF(" Statut: 1 [Unregistered ID]\n"); break; case 2: - printf (" Statut: 2 [Incorrect Password]\n"); + PRINTF(" Statut: 2 [Incorrect Password]\n"); break; case 3: - printf (" Statut: 3 [This ID is expired]\n"); + PRINTF(" Statut: 3 [This ID is expired]\n"); break; case 4: - printf - (" Statut: 4 [Rejected from Server]\n"); + PRINTF(" Statut: 4 [Rejected from Server]\n"); break; case 5: - printf - (" Statut: 5 [You have been blocked by the GM Team]\n"); + PRINTF(" Statut: 5 [You have been blocked by the GM Team]\n"); break; case 6: - printf - (" Statut: 6 [Your Game's EXE file is not the latest version]\n"); + PRINTF(" Statut: 6 [Your Game's EXE file is not the latest version]\n"); break; case 7: - printf - (" Statut: 7 [You are Prohibited to log in until %s]\n", + PRINTF(" Statut: 7 [You are Prohibited to log in until %s]\n", error_message); break; case 8: - printf - (" Statut: 8 [Server is jammed due to over populated]\n"); + PRINTF(" Statut: 8 [Server is jammed due to over populated]\n"); break; case 9: - printf (" Statut: 9 [No MSG]\n"); + PRINTF(" Statut: 9 [No MSG]\n"); break; default: // 100 - printf - (" Statut: %d [This ID is totally erased]\n", - RFIFOL (fd, 36)); + PRINTF(" Statut: %d [This ID is totally erased]\n", + RFIFOL(fd, 36)); break; } - if (defaultlanguage == 'F') + if (!ban_until_time) { - if (ban_until_time == 0) - { - printf (" Banissement: non banni.\n"); - } - else - { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (&ban_until_time)); - printf (" Banissement: jusqu'au %s.\n", - tmpstr); - } - if (RFIFOL (fd, 32) > 1) - printf (" Compteur: %d connexions.\n", - RFIFOL (fd, 32)); - else - printf (" Compteur: %d connexion.\n", - RFIFOL (fd, 32)); - printf (" Dernière connexion le: %s (ip: %s)\n", - lastlogin, last_ip); - if (connect_until_time == 0) - { - printf (" Limite de validité: illimité.\n"); - } - else - { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (&connect_until_time)); - printf (" Limite de validité: jusqu'au %s.\n", - tmpstr); - } + PRINTF(" Banishment: not banished.\n"); } else { - if (ban_until_time == 0) - { - printf (" Banishment: not banished.\n"); - } - else - { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (&ban_until_time)); - printf (" Banishment: until %s.\n", tmpstr); - } - if (RFIFOL (fd, 32) > 1) - printf (" Count: %d connections.\n", - RFIFOL (fd, 32)); - else - printf (" Count: %d connection.\n", - RFIFOL (fd, 32)); - printf (" Last connection at: %s (ip: %s)\n", - lastlogin, last_ip); - if (connect_until_time == 0) - { - printf (" Validity limit: unlimited.\n"); - } - else - { - char tmpstr[128]; - strftime (tmpstr, 24, date_format, - localtime (&connect_until_time)); - printf (" Validity limit: until %s.\n", - tmpstr); - } + timestamp_seconds_buffer tmpstr; + stamp_time(tmpstr, &ban_until_time); + PRINTF(" Banishment: until %s.\n", tmpstr); + } + if (RFIFOL(fd, 32) > 1) + PRINTF(" Count: %d connections.\n", + RFIFOL(fd, 32)); + else + PRINTF(" Count: %d connection.\n", + RFIFOL(fd, 32)); + PRINTF(" Last connection at: %s (ip: %s)\n", + lastlogin, last_ip); + if (!connect_until_time) + { + PRINTF(" Validity limit: unlimited.\n"); + } + else + { + timestamp_seconds_buffer tmpstr; + stamp_time(tmpstr, &connect_until_time); + PRINTF(" Validity limit: until %s.\n", + tmpstr); } - printf (" Memo: '%s'\n", memo); + PRINTF(" Memo: '%s'\n", memo); } } bytes_to_read = 0; - RFIFOSKIP (fd, 150 + RFIFOW (fd, 148)); + RFIFOSKIP(fd, 150 + RFIFOW(fd, 148)); break; default: - printf - ("Remote administration has been disconnected (unknown packet).\n"); - ladmin_log ("'End of connection, unknown packet.\n"); + PRINTF("Remote administration has been disconnected (unknown packet).\n"); + LADMIN_LOG("'End of connection, unknown packet.\n"); session[fd]->eof = 1; return; } } // if we don't wait new packets, do the prompt - prompt (); + prompt(); } //------------------------------------ // Function to connect to login-server //------------------------------------ static -int Connect_login_server (void) +int Connect_login_server(void) { - if (defaultlanguage == 'F') - { - Iprintf ("Essai de connection au server de logins...\n"); - ladmin_log ("Essai de connection au server de logins...\n"); - } - else - { - Iprintf ("Attempt to connect to login-server...\n"); - ladmin_log ("Attempt to connect to login-server...\n"); - } + Iprintf("Attempt to connect to login-server...\n"); + LADMIN_LOG("Attempt to connect to login-server...\n"); - if ((login_fd = make_connection (login_ip, loginserverport)) < 0) + if ((login_fd = make_connection(login_ip, loginserverport)) < 0) return 0; -#ifdef PASSWORDENC if (passenc == 0) { -#endif - WFIFOW (login_fd, 0) = 0x7918; // Request for administation login - WFIFOW (login_fd, 2) = 0; // no encrypted - memcpy (WFIFOP (login_fd, 4), loginserveradminpassword, 24); - WFIFOSET (login_fd, 28); + WFIFOW(login_fd, 0) = 0x7918; // Request for administation login + WFIFOW(login_fd, 2) = 0; // no encrypted + memcpy(WFIFOP(login_fd, 4), loginserveradminpassword, 24); + WFIFOSET(login_fd, 28); bytes_to_read = 1; - if (defaultlanguage == 'F') - { - Iprintf ("Envoi du mot de passe...\n"); - ladmin_log ("Envoi du mot de passe...\n"); - } - else - { - Iprintf ("Sending of the password...\n"); - ladmin_log ("Sending of the password...\n"); - } -#ifdef PASSWORDENC + Iprintf("Sending of the password...\n"); + LADMIN_LOG("Sending of the password...\n"); } else { - WFIFOW (login_fd, 0) = 0x791a; // Sending request about the coding key - WFIFOSET (login_fd, 2); + WFIFOW(login_fd, 0) = 0x791a; // Sending request about the coding key + WFIFOSET(login_fd, 2); bytes_to_read = 1; - if (defaultlanguage == 'F') - { - Iprintf ("Demande de la clef MD5...\n"); - ladmin_log ("Demande de la clef MD5...\n"); - } - else - { - Iprintf ("Request about the MD5 key...\n"); - ladmin_log ("Request about the MD5 key...\n"); - } + Iprintf("Request about the MD5 key...\n"); + LADMIN_LOG("Request about the MD5 key...\n"); } -#endif return 0; } @@ -6212,147 +3566,74 @@ int Connect_login_server (void) // Reading general configuration file //----------------------------------- static -int ladmin_config_read (const char *cfgName) +int ladmin_config_read(const char *cfgName) { - char line[1024], w1[1024], w2[1024]; - FILE *fp; - - fp = fopen_ (cfgName, "r"); - if (fp == NULL) + std::ifstream in(cfgName); + if (!in.is_open()) { - if (defaultlanguage == 'F') - { - printf ("\033[0mFichier de configuration (%s) non trouvé.\n", - cfgName); - } - else - { - printf ("\033[0mConfiguration file (%s) not found.\n", cfgName); - } + PRINTF("\033[0mConfiguration file (%s) not found.\n", cfgName); return 1; } - if (defaultlanguage == 'F') - { - Iprintf - ("\033[0m---Début de lecture du fichier de configuration Ladmin (%s)\n", - cfgName); - } - else + Iprintf("\033[0m---Start reading of Ladmin configuration file (%s)\n", + cfgName); + std::string line; + while (std::getline(in, line)) { - Iprintf - ("\033[0m---Start reading of Ladmin configuration file (%s)\n", - cfgName); - } - while (fgets (line, sizeof (line) - 1, fp)) - { - if (line[0] == '/' && line[1] == '/') + std::string w1, w2; + if (!split_key_value(line, &w1, &w2)) continue; - line[sizeof (line) - 1] = '\0'; - if (sscanf (line, "%[^:]: %[^\r\n]", w1, w2) == 2) + if (w1 == "login_ip") { - remove_control_chars (w1); - remove_control_chars (w2); - - if (strcasecmp (w1, "login_ip") == 0) - { - struct hostent *h = gethostbyname (w2); - if (h != NULL) - { - if (defaultlanguage == 'F') - { - Iprintf - ("Adresse du serveur de logins: %s -> %d.%d.%d.%d\n", - w2, (unsigned char) h->h_addr[0], - (unsigned char) h->h_addr[1], - (unsigned char) h->h_addr[2], - (unsigned char) h->h_addr[3]); - } - else - { - Iprintf - ("Login server IP address: %s -> %d.%d.%d.%d\n", - w2, (unsigned char) h->h_addr[0], - (unsigned char) h->h_addr[1], - (unsigned char) h->h_addr[2], - (unsigned char) h->h_addr[3]); - } - sprintf (loginserverip, "%d.%d.%d.%d", - (unsigned char) h->h_addr[0], - (unsigned char) h->h_addr[1], - (unsigned char) h->h_addr[2], - (unsigned char) h->h_addr[3]); - } - else - memcpy (loginserverip, w2, 16); - } - else if (strcasecmp (w1, "login_port") == 0) - { - loginserverport = atoi (w2); - } - else if (strcasecmp (w1, "admin_pass") == 0) - { - strncpy (loginserveradminpassword, w2, - sizeof (loginserveradminpassword)); - loginserveradminpassword[sizeof (loginserveradminpassword) - - 1] = '\0'; -#ifdef PASSWORDENC - } - else if (strcasecmp (w1, "passenc") == 0) - { - passenc = atoi (w2); - if (passenc < 0 || passenc > 2) - passenc = 0; -#endif - } - else if (strcasecmp (w1, "defaultlanguage") == 0) + struct hostent *h = gethostbyname(w2.c_str()); + if (h != NULL) { - if (w2[0] == 'F' || w2[0] == 'E') - defaultlanguage = w2[0]; - } - else if (strcasecmp (w1, "ladmin_log_filename") == 0) - { - strncpy (ladmin_log_filename, w2, - sizeof (ladmin_log_filename)); - ladmin_log_filename[sizeof (ladmin_log_filename) - 1] = '\0'; - } - else if (strcasecmp (w1, "date_format") == 0) - { // note: never have more than 19 char for the date! - switch (atoi (w2)) - { - case 0: - strcpy (date_format, "%d-%m-%Y %H:%M:%S"); // 31-12-2004 23:59:59 - break; - case 1: - strcpy (date_format, "%m-%d-%Y %H:%M:%S"); // 12-31-2004 23:59:59 - break; - case 2: - strcpy (date_format, "%Y-%d-%m %H:%M:%S"); // 2004-31-12 23:59:59 - break; - case 3: - strcpy (date_format, "%Y-%m-%d %H:%M:%S"); // 2004-12-31 23:59:59 - break; - } - } - else if (strcasecmp (w1, "import") == 0) - { - ladmin_config_read (w2); + Iprintf("Login server IP address: %s -> %d.%d.%d.%d\n", + w2, (unsigned char) h->h_addr[0], + (unsigned char) h->h_addr[1], + (unsigned char) h->h_addr[2], + (unsigned char) h->h_addr[3]); + sprintf(loginserverip, "%d.%d.%d.%d", + (unsigned char) h->h_addr[0], + (unsigned char) h->h_addr[1], + (unsigned char) h->h_addr[2], + (unsigned char) h->h_addr[3]); } + else + strzcpy(loginserverip, w2.c_str(), 16); + } + else if (w1 == "login_port") + { + loginserverport = atoi(w2.c_str()); + } + else if (w1 == "admin_pass") + { + strzcpy(loginserveradminpassword, w2.c_str(), sizeof(loginserveradminpassword)); + } + else if (w1 == "passenc") + { + passenc = atoi(w2.c_str()); + if (passenc < 0 || passenc > 2) + passenc = 0; + } + else if (w1 == "ladmin_log_filename") + { + strzcpy(ladmin_log_filename, w2.c_str(), sizeof(ladmin_log_filename)); + } + else if (w1 == "import") + { + ladmin_config_read(w2.c_str()); + } + else + { + PRINTF("WARNING: unknown ladmin config key: %s\n", w1); } } - fclose_ (fp); - login_ip = inet_addr (loginserverip); + login_ip = inet_addr(loginserverip); - if (defaultlanguage == 'F') - { - Iprintf ("---Lecture du fichier de configuration Ladmin terminée.\n"); - } - else - { - Iprintf ("---End reading of Ladmin configuration file.\n"); - } + Iprintf("---End reading of Ladmin configuration file.\n"); return 0; } @@ -6360,27 +3641,15 @@ int ladmin_config_read (const char *cfgName) //-------------------------------------- // Function called at exit of the server //-------------------------------------- -void term_func (void) +void term_func(void) { if (already_exit_function == 0) { - delete_session (login_fd); + delete_session(login_fd); - if (defaultlanguage == 'F') - { - Iprintf - ("\033[0m----Fin de Ladmin (fin normale avec fermeture de tous les fichiers).\n"); - ladmin_log - ("----Fin de Ladmin (fin normale avec fermeture de tous les fichiers).\n"); - } - else - { - Iprintf - ("\033[0m----End of Ladmin (normal end with closing of all files).\n"); - ladmin_log - ("----End of Ladmin (normal end with closing of all files).\n"); - } + Iprintf("\033[0m----End of Ladmin (normal end with closing of all files).\n"); + LADMIN_LOG("----End of Ladmin (normal end with closing of all files).\n"); already_exit_function = 1; } @@ -6389,51 +3658,25 @@ void term_func (void) //------------------------ // Main function of ladmin //------------------------ -int do_init (int argc, char **argv) +int do_init(int argc, char **argv) { - eathena_interactive_session = isatty (0); + eathena_interactive_session = isatty(0); // read ladmin configuration - ladmin_config_read ((argc > 1) ? argv[1] : LADMIN_CONF_NAME); + ladmin_config_read((argc > 1) ? argv[1] : LADMIN_CONF_NAME); - ladmin_log (""); - if (defaultlanguage == 'F') - { - ladmin_log ("Fichier de configuration lu.\n"); - } - else - { - ladmin_log ("Configuration file readed.\n"); - } + LADMIN_LOG(""); + LADMIN_LOG("Configuration file readed.\n"); - srand (time (NULL)); + set_defaultparse(parse_fromlogin); - set_defaultparse (parse_fromlogin); + Iprintf("EAthena login-server administration tool.\n"); + Iprintf("(for eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION, + ATHENA_MINOR_VERSION, ATHENA_REVISION); - if (defaultlanguage == 'F') - { - Iprintf ("Outil d'administration à distance de eAthena.\n"); - Iprintf ("(pour eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION, - ATHENA_MINOR_VERSION, ATHENA_REVISION); - } - else - { - Iprintf ("EAthena login-server administration tool.\n"); - Iprintf ("(for eAthena version %d.%d.%d.)\n", ATHENA_MAJOR_VERSION, - ATHENA_MINOR_VERSION, ATHENA_REVISION); - } - - if (defaultlanguage == 'F') - { - ladmin_log ("Ladmin est prêt.\n"); - Iprintf ("Ladmin est \033[1;32mprêt\033[0m.\n\n"); - } - else - { - ladmin_log ("Ladmin is ready.\n"); - Iprintf ("Ladmin is \033[1;32mready\033[0m.\n\n"); - } + LADMIN_LOG("Ladmin is ready.\n"); + Iprintf("Ladmin is \033[1;32mready\033[0m.\n\n"); - Connect_login_server (); + Connect_login_server(); return 0; } diff --git a/src/ladmin/ladmin.hpp b/src/ladmin/ladmin.hpp deleted file mode 100644 index 77d7fe4..0000000 --- a/src/ladmin/ladmin.hpp +++ /dev/null @@ -1,11 +0,0 @@ -// $Id: ladmin.h,v 1.1.1.1 2004/09/10 17:26:52 MagicalTux Exp $ -#ifndef LADMIN_HPP -#define LADMIN_HPP - -#define LADMIN_CONF_NAME "conf/ladmin_athena.conf" -#define PASSWORDENC 3 // A definition is given when making an encryption password correspond. - // It is 1 at the time of passwordencrypt. - // It is made into 2 at the time of passwordencrypt2. - // When it is made 3, it corresponds to both. - -#endif |