From 265f284802dd487b9cdb1dd17fd02d1104a2aa89 Mon Sep 17 00:00:00 2001 From: acanas Date: Thu, 30 Sep 2021 20:11:00 +0200 Subject: [PATCH] Version 21.20.1: Sep 30, 2021 Code refactoring related to nicknames. --- swad_API.c | 12 ++++++------ swad_account.c | 18 +++++++++--------- swad_account_database.c | 2 +- swad_account_database.h | 2 +- swad_agenda.c | 4 ++-- swad_changelog.h | 3 ++- swad_enrolment.c | 4 ++-- swad_message.c | 2 +- swad_message.h | 2 ++ swad_nickname.c | 18 +++++++++++------- swad_nickname.h | 4 +--- swad_nickname_database.c | 12 ++++++------ swad_nickname_database.h | 8 ++++---- swad_parameter.c | 6 +++--- swad_profile.c | 4 ++-- swad_string.c | 10 +++++----- swad_user.c | 13 +++++++------ swad_user.h | 2 +- 18 files changed, 66 insertions(+), 60 deletions(-) diff --git a/swad_API.c b/swad_API.c index 762ee578..415eb97a 100644 --- a/swad_API.c +++ b/swad_API.c @@ -231,7 +231,7 @@ static int API_GetCurrentDegCodFromCurrentCrsCod (void); static bool API_GetSomeUsrDataFromUsrCod (struct UsrData *UsrDat,long CrsCod); static int API_CheckParamsNewAccount (char *NewNickWithArr, // Input - char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1], // Output + char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1], // Output char *NewEmail, // Input-output char *NewPlainPassword, // Input char *NewEncryptedPassword); // Output @@ -679,7 +679,7 @@ int swad__createAccount (struct soap *soap, char *userNickname,char *userEmail,char *userPassword,char *appKey, // input struct swad__createAccountOutput *createAccountOut) // output { - char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]; + char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; char NewEncryptedPassword[Pwd_BYTES_ENCRYPTED_PASSWORD + 1]; int Result; int ReturnCode; @@ -752,14 +752,14 @@ int swad__createAccount (struct soap *soap, // Return false on error //char *userNickname,char *userEmail,char *userID,char *userPassword static int API_CheckParamsNewAccount (char *NewNickWithArr, // Input - char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1], // Output + char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1], // Output char *NewEmail, // Input-output char *NewPlainPassword, // Input char *NewEncryptedPassword) // Output { /***** Step 1/3: Check new nickname *****/ /* Make a copy without possible starting arrobas */ - Str_Copy (NewNickWithoutArr,NewNickWithArr,Cns_MAX_BYTES_USR_LOGIN); + Str_Copy (NewNickWithoutArr,NewNickWithArr,Nck_MAX_BYTES_NICK_WITHOUT_ARROBA); if (Nck_CheckIfNickWithArrIsValid (NewNickWithArr)) // If new nickname is valid { /***** Remove arrobas at the beginning *****/ @@ -3569,7 +3569,7 @@ int swad__sendMessage (struct soap *soap, { int ReturnCode; long ReplyUsrCod = -1L; - char Nickname[Cns_MAX_BYTES_USR_LOGIN + 1]; + char Nickname[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; char *Query = NULL; MYSQL_RES *mysql_res; MYSQL_ROW row; @@ -3658,7 +3658,7 @@ int swad__sendMessage (struct soap *soap, while (*Ptr) { /* Find next string in text until comma (leading and trailing spaces are removed) */ - Str_GetNextStringUntilComma (&Ptr,Nickname,Cns_MAX_BYTES_USR_LOGIN); + Str_GetNextStringUntilComma (&Ptr,Nickname,sizeof (Nickname) - 1); /* Check if string is a valid nickname */ if (Nck_CheckIfNickWithArrIsValid (Nickname)) // String is a nickname? diff --git a/swad_account.c b/swad_account.c index 8ac5884f..6b6e9e38 100644 --- a/swad_account.c +++ b/swad_account.c @@ -94,9 +94,9 @@ extern struct Globals Gbl; static void Acc_ShowFormCheckIfIHaveAccount (const char *Title); static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrData *UsrDat); -static void Acc_ShowFormRequestNewAccountWithParams (const char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1], +static void Acc_ShowFormRequestNewAccountWithParams (const char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1], const char *NewEmail); -static bool Acc_GetParamsNewAccount (char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1], +static bool Acc_GetParamsNewAccount (char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1], char NewEmail[Cns_MAX_BYTES_EMAIL_ADDRESS + 1], char *NewEncryptedPassword); static void Acc_CreateNewEncryptedUsrCod (struct UsrData *UsrDat); @@ -361,7 +361,7 @@ void Acc_ShowFormCreateMyAccount (void) /************ Show form to create a new account using parameters *************/ /*****************************************************************************/ -static void Acc_ShowFormRequestNewAccountWithParams (const char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1], +static void Acc_ShowFormRequestNewAccountWithParams (const char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1], const char *NewEmail) { extern const char *Hlp_PROFILE_SignUp; @@ -371,7 +371,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char NewNickWithoutAr extern const char *Txt_HELP_nickname; extern const char *Txt_HELP_email; extern const char *Txt_Email; - char NewNickWithArr[Cns_MAX_BYTES_USR_LOGIN + 1]; + char NewNickWithArr[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; /***** Begin form to enter some data of the new user *****/ Frm_BeginForm (ActCreUsrAcc); @@ -596,7 +596,7 @@ static void Acc_PutParamsToRemoveMyAccount (void *EncryptedUsrCod) bool Acc_CreateMyNewAccountAndLogIn (void) { - char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]; + char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; char NewEmail[Cns_MAX_BYTES_EMAIL_ADDRESS + 1]; char NewEncryptedPassword[Pwd_BYTES_ENCRYPTED_PASSWORD + 1]; @@ -644,7 +644,7 @@ bool Acc_CreateMyNewAccountAndLogIn (void) /*****************************************************************************/ // Return false on error -static bool Acc_GetParamsNewAccount (char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1], +static bool Acc_GetParamsNewAccount (char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1], char NewEmail[Cns_MAX_BYTES_EMAIL_ADDRESS + 1], char NewEncryptedPassword[Pwd_BYTES_ENCRYPTED_PASSWORD + 1]) { @@ -652,15 +652,15 @@ static bool Acc_GetParamsNewAccount (char NewNickWithoutArr[Cns_MAX_BYTES_USR_LO extern const char *Txt_The_nickname_entered_X_is_not_valid_; extern const char *Txt_The_email_address_X_had_been_registered_by_another_user; extern const char *Txt_The_email_address_entered_X_is_not_valid; - char NewNickWithArr[1 + Cns_MAX_BYTES_USR_LOGIN + 1]; + char NewNickWithArr[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; char NewPlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1]; bool Error = false; /***** Step 1/3: Get new nickname from form *****/ - Par_GetParToText ("NewNick",NewNickWithArr,Cns_MAX_BYTES_USR_LOGIN); + Par_GetParToText ("NewNick",NewNickWithArr,sizeof (NewNickWithArr) - 1); /* Remove arrobas at the beginning */ - Str_Copy (NewNickWithoutArr,NewNickWithArr,Cns_MAX_BYTES_USR_LOGIN); + Str_Copy (NewNickWithoutArr,NewNickWithArr,sizeof (NewNickWithArr) - 1); Str_RemoveLeadingArrobas (NewNickWithoutArr); /* Create a new version of the nickname with arroba */ diff --git a/swad_account_database.c b/swad_account_database.c index 55d7b3ee..9ef3f175 100644 --- a/swad_account_database.c +++ b/swad_account_database.c @@ -80,7 +80,7 @@ unsigned Acc_DB_GetUsrsWithID (MYSQL_RES **mysql_res, /****** Check if a nickname matches any of the nicknames of other users ******/ /*****************************************************************************/ -bool Acc_DB_CheckIfNicknameAlreadyExists (const char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]) +bool Acc_DB_CheckIfNicknameAlreadyExists (const char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]) { return (DB_QueryCOUNT ("can not check if nickname already existed", "SELECT COUNT(*)" diff --git a/swad_account_database.h b/swad_account_database.h index 780da59c..7c1130d6 100644 --- a/swad_account_database.h +++ b/swad_account_database.h @@ -47,7 +47,7 @@ unsigned Acc_DB_GetUsrsWithID (MYSQL_RES **mysql_res, const char ID[ID_MAX_BYTES_USR_ID + 1]); -bool Acc_DB_CheckIfNicknameAlreadyExists (const char NewNickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]); +bool Acc_DB_CheckIfNicknameAlreadyExists (const char NewNickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]); bool Acc_DB_CheckIfEmailAlreadyExists (const char NewEmail[Cns_MAX_BYTES_EMAIL_ADDRESS + 1]); long Acc_DB_CreateNewUsr (const struct UsrData *UsrDat); diff --git a/swad_agenda.c b/swad_agenda.c index c4b6f060..0cefbc89 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -156,7 +156,7 @@ void Agd_PutFormLogInToShowUsrAgenda (void) void Agd_PutParamAgd (void) { - char Nickname[1 + Cns_MAX_BYTES_USR_LOGIN + 1]; + char Nickname[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; snprintf (Nickname,sizeof (Nickname),"@%s",Gbl.Usrs.Other.UsrDat.Nickname); Par_PutHiddenParamString (NULL,"agd",Nickname); @@ -710,7 +710,7 @@ static void Agd_PutIconToViewEditMyFullAgenda (void *EncryptedUsrCod) static void Agd_PutIconToShowQR (void) { - char URL[Cns_MAX_BYTES_WWW + Cns_MAX_BYTES_USR_LOGIN + 1]; + char URL[Cns_MAX_BYTES_WWW + 1]; extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; snprintf (URL,sizeof (URL),"%s/%s?agd=@%s", diff --git a/swad_changelog.h b/swad_changelog.h index b1216e9e..cb0c1d13 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,13 +602,14 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.20 (2021-09-30)" +#define Log_PLATFORM_VERSION "SWAD 21.20.1 (2021-09-30)" #define CSS_FILE "swad20.45.css" #define JS_FILE "swad20.69.1.js" /* TODO: Rename CENTRE to CENTER in help wiki. TODO: Rename ASSESSMENT.Announcements to ASSESSMENT.Calls_for_exams + Version 21.20.1: Sep 30, 2021 Code refactoring related to nicknames. (317756 lines) Version 21.20: Sep 30, 2021 New module swad_nickname_database for database queries related to nicknames. (317751 lines) Version 21.19: Sep 29, 2021 New module swad_network_database for database queries related to webs/social networks. (317644 lines) Version 21.18: Sep 29, 2021 New module swad_MFU_database for database queries related to most frequently used actions. (317529 lines) diff --git a/swad_enrolment.c b/swad_enrolment.c index bd7f3b4f..1a6b1303 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -1102,7 +1102,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role) /* Find next string in text */ Str_GetNextStringUntilSeparator (&Ptr,UsrDat.UsrIDNickOrEmail, - Cns_MAX_BYTES_USR_LOGIN); + sizeof (UsrDat.UsrIDNickOrEmail) - 1); /* Reset default list of users' codes */ ListUsrCods.NumUsrs = 0; @@ -1230,7 +1230,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role) /* Find next string in text */ Str_GetNextStringUntilSeparator (&Ptr,UsrDat.UsrIDNickOrEmail, - Cns_MAX_BYTES_USR_LOGIN); + sizeof (UsrDat.UsrIDNickOrEmail) - 1); /* Reset default list of users' codes */ ListUsrCods.NumUsrs = 0; diff --git a/swad_message.c b/swad_message.c index 34b12a17..d0039136 100644 --- a/swad_message.c +++ b/swad_message.c @@ -674,7 +674,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (struct Msg_Messages *Messag static void Msg_PutHiddenParamAnotherRecipient (const struct UsrData *UsrDat) { - char NickWithArr[1 + Cns_MAX_BYTES_USR_LOGIN + 1]; + char NickWithArr[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; snprintf (NickWithArr,sizeof (NickWithArr),"@%s",UsrDat->Nickname); Par_PutHiddenParamString (NULL,"OtherRecipients",NickWithArr); diff --git a/swad_message.h b/swad_message.h index 84568236..fa5b147d 100644 --- a/swad_message.h +++ b/swad_message.h @@ -38,6 +38,8 @@ #define Msg_MAX_CHARS_FILTER_CONTENT (128 - 1) // 127 #define Msg_MAX_BYTES_FILTER_CONTENT ((Msg_MAX_CHARS_FILTER_CONTENT + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047 +#define Msg_MAX_BYTES_LIST_OTHER_RECIPIENTS ((Cns_MAX_BYTES_USR_LOGIN + 2) * Cfg_MAX_USRS_IN_LIST) + /*****************************************************************************/ /******************************** Public types *******************************/ /*****************************************************************************/ diff --git a/swad_nickname.c b/swad_nickname.c index 632e0bd8..74517add 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -75,7 +75,7 @@ static void Nck_UpdateUsrNick (struct UsrData *UsrDat); bool Nck_CheckIfNickWithArrIsValid (const char *NickWithArr) { - char NickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]; + char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; unsigned Length; const char *Ptr; @@ -113,9 +113,10 @@ bool Nck_CheckIfNickWithArrIsValid (const char *NickWithArr) // Nickname may have leading '@' // Returns true if nickname found in database -long Nck_GetUsrCodFromNickname (const char Nickname[Cns_MAX_BYTES_USR_LOGIN + 1]) +long Nck_GetUsrCodFromNickname (const char Nickname[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]) { - char NickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]; + char NickWithArr[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; + char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; /***** Trivial check 1: nickname should be not null *****/ if (!Nickname) @@ -125,9 +126,12 @@ long Nck_GetUsrCodFromNickname (const char Nickname[Cns_MAX_BYTES_USR_LOGIN + 1] if (!Nickname[0]) return -1L; - /***** Make a copy without possible starting arrobas *****/ - Str_Copy (NickWithoutArr,Nickname,sizeof (NickWithoutArr) - 1); - Str_RemoveLeadingArrobas (NickWithoutArr); + /***** Make a copy with possible leading arrobas *****/ + Str_Copy (NickWithArr,Nickname,sizeof (NickWithArr) - 1); + + /***** Remove leading arrobas *****/ + Str_RemoveLeadingArrobas (NickWithArr); + Str_Copy (NickWithoutArr,NickWithArr,sizeof (NickWithoutArr) - 1); /***** Get user's code from database *****/ return Nck_DB_GetUsrCodFromNickname (NickWithoutArr); @@ -175,7 +179,7 @@ static void Nck_ShowFormChangeUsrNickname (bool ItsMe, unsigned NumNicks; unsigned NumNick; Act_Action_t NextAction; - char NickWithArr[1 + Cns_MAX_BYTES_USR_LOGIN + 1]; + char NickWithArr[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; const struct UsrData *UsrDat = (ItsMe ? &Gbl.Usrs.Me.UsrDat : &Gbl.Usrs.Other.UsrDat); diff --git a/swad_nickname.h b/swad_nickname.h index 69f32086..e0b08c89 100644 --- a/swad_nickname.h +++ b/swad_nickname.h @@ -38,15 +38,13 @@ #define Nck_MAX_CHARS_NICK_WITHOUT_ARROBA 16 #define Nck_MAX_BYTES_NICK_WITHOUT_ARROBA Nck_MAX_CHARS_NICK_WITHOUT_ARROBA -#define Nck_MAX_BYTES_LIST_NICKS ((Cns_MAX_BYTES_USR_LOGIN + 2) * Cfg_MAX_USRS_IN_LIST) - /*****************************************************************************/ /***************************** Public prototypes *****************************/ /*****************************************************************************/ bool Nck_CheckIfNickWithArrIsValid (const char *NickWithArr); -long Nck_GetUsrCodFromNickname (const char Nickname[Cns_MAX_BYTES_USR_LOGIN + 1]); +long Nck_GetUsrCodFromNickname (const char Nickname[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]); void Nck_ShowFormChangeMyNickname (bool IMustFillNickname); void Nck_ShowFormChangeOtherUsrNickname (void); diff --git a/swad_nickname_database.c b/swad_nickname_database.c index b5df68b5..eea484dd 100644 --- a/swad_nickname_database.c +++ b/swad_nickname_database.c @@ -79,7 +79,7 @@ void Nck_DB_UpdateNick (long UsrCod,const char *NewNickname) /************** Get user's code of a user from his/her nickname **************/ /*****************************************************************************/ -long Nck_DB_GetUsrCodFromNickname (const char NickWithoutArroba[Cns_MAX_BYTES_USR_LOGIN + 1]) +long Nck_DB_GetUsrCodFromNickname (const char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]) { return DB_QuerySELECTCode ("can not get user's code", "SELECT usr_nicknames.UsrCod" @@ -87,7 +87,7 @@ long Nck_DB_GetUsrCodFromNickname (const char NickWithoutArroba[Cns_MAX_BYTES_US "usr_data" " WHERE usr_nicknames.Nickname='%s'" " AND usr_nicknames.UsrCod=usr_data.UsrCod", - NickWithoutArroba); + NickWithoutArr); } /*****************************************************************************/ @@ -95,10 +95,10 @@ long Nck_DB_GetUsrCodFromNickname (const char NickWithoutArroba[Cns_MAX_BYTES_US /*****************************************************************************/ void Nck_DB_GetNicknameFromUsrCod (long UsrCod, - char NickWithoutArroba[Cns_MAX_BYTES_USR_LOGIN + 1]) + char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]) { /***** Get current (last updated) user's nickname from database *****/ - DB_QuerySELECTString (NickWithoutArroba,Cns_MAX_BYTES_USR_LOGIN, + DB_QuerySELECTString (NickWithoutArr,Nck_MAX_BYTES_NICK_WITHOUT_ARROBA, "can not get nickname", "SELECT Nickname" " FROM usr_nicknames" @@ -127,7 +127,7 @@ unsigned Nck_DB_GetUsrNicknames (MYSQL_RES **mysql_res,long UsrCod) /************ Check if nickname matches any of a user's nicknames ************/ /*****************************************************************************/ -bool Nck_DB_CheckIfNickMatchesAnyUsrNick (long UsrCod,const char NickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]) +bool Nck_DB_CheckIfNickMatchesAnyUsrNick (long UsrCod,const char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]) { return (DB_QueryCOUNT ("can not check if nickname already existed", "SELECT COUNT(*)" @@ -142,7 +142,7 @@ bool Nck_DB_CheckIfNickMatchesAnyUsrNick (long UsrCod,const char NickWithoutArr[ /********* Check if nickname matches any of other user's nicknames ***********/ /*****************************************************************************/ -bool Nck_DB_CheckIfNickMatchesAnyOtherUsrsNicks (long UsrCod,const char NickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]) +bool Nck_DB_CheckIfNickMatchesAnyOtherUsrsNicks (long UsrCod,const char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]) { return (DB_QueryCOUNT ("can not check if nickname already existed", "SELECT COUNT(*)" diff --git a/swad_nickname_database.h b/swad_nickname_database.h index a86f8f53..1e038ea9 100644 --- a/swad_nickname_database.h +++ b/swad_nickname_database.h @@ -40,12 +40,12 @@ void Nck_DB_UpdateNick (long UsrCod,const char *NewNickname); -long Nck_DB_GetUsrCodFromNickname (const char NickWithoutArroba[Cns_MAX_BYTES_USR_LOGIN + 1]); +long Nck_DB_GetUsrCodFromNickname (const char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]); void Nck_DB_GetNicknameFromUsrCod (long UsrCod, - char Nickname[Cns_MAX_BYTES_USR_LOGIN + 1]); + char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]); unsigned Nck_DB_GetUsrNicknames (MYSQL_RES **mysql_res,long UsrCod); -bool Nck_DB_CheckIfNickMatchesAnyUsrNick (long UsrCod,const char NickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]); -bool Nck_DB_CheckIfNickMatchesAnyOtherUsrsNicks (long UsrCod,const char NickWithoutArr[Cns_MAX_BYTES_USR_LOGIN + 1]); +bool Nck_DB_CheckIfNickMatchesAnyUsrNick (long UsrCod,const char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]); +bool Nck_DB_CheckIfNickMatchesAnyOtherUsrsNicks (long UsrCod,const char NickWithoutArr[Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]); void Nck_DB_RemoveNickname (long UsrCod,const char *Nickname); void Nck_DB_RemoveUsrNicknames (long UsrCod); diff --git a/swad_parameter.c b/swad_parameter.c index d091b4fe..d9fc458d 100644 --- a/swad_parameter.c +++ b/swad_parameter.c @@ -662,7 +662,7 @@ void Par_GetMainParams (void) extern const char *The_ThemeId[The_NUM_THEMES]; extern const char *Ico_IconSetId[Ico_NUM_ICON_SETS]; long ActCod; - char Nickname[Cns_MAX_BYTES_USR_LOGIN + 1]; + char Nickname[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; char URL[PATH_MAX + 1]; char LongStr[Cns_MAX_DECIMAL_DIGITS_LONG + 1]; @@ -690,7 +690,7 @@ void Par_GetMainParams (void) /***** Get another user's nickname, if exists (this nickname is used to go to another user's profile, not to get the logged user) *****/ - if (Par_GetParToText ("usr",Nickname,Cns_MAX_BYTES_USR_LOGIN)) + if (Par_GetParToText ("usr",Nickname,sizeof (Nickname) - 1)) { if (Nickname[0]) { @@ -706,7 +706,7 @@ void Par_GetMainParams (void) Gbl.Action.Act = Gbl.Action.Original = ActSeeOthPubPrf; // Set default action if no other is specified } } - else if (Par_GetParToText ("agd",Nickname,Cns_MAX_BYTES_USR_LOGIN)) + else if (Par_GetParToText ("agd",Nickname,sizeof (Nickname) - 1)) { if (Nickname[0]) { diff --git a/swad_profile.c b/swad_profile.c index 1b9bb54d..f4ffa3ab 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -195,7 +195,7 @@ void Prf_RequestUserProfile (void) extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Nickname; extern const char *Txt_Continue; - char NickWithArr[1 + Cns_MAX_BYTES_USR_LOGIN + 1]; + char NickWithArr[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; if (Gbl.Usrs.Me.Logged) { @@ -222,7 +222,7 @@ void Prf_RequestUserProfile (void) snprintf (NickWithArr,sizeof (NickWithArr),"@%s", Gbl.Usrs.Me.UsrDat.Nickname); - HTM_INPUT_TEXT ("usr",Cns_MAX_BYTES_USR_LOGIN,NickWithArr, + HTM_INPUT_TEXT ("usr",sizeof (NickWithArr) - 1,NickWithArr, HTM_DONT_SUBMIT_ON_CHANGE, "size=\"18\""); HTM_LABEL_End (); diff --git a/swad_string.c b/swad_string.c index aeb39bbc..2ef848d1 100644 --- a/swad_string.c +++ b/swad_string.c @@ -1885,16 +1885,16 @@ void Str_RemoveLeadingZeros (char *Str) void Str_RemoveLeadingArrobas (char *Str) { - size_t NumLeadingArrobas; + size_t NumLeadingArr; if (Str) if (Str[0]) { - NumLeadingArrobas = strspn (Str,"@"); - if (NumLeadingArrobas) + NumLeadingArr = strspn (Str,"@"); + if (NumLeadingArr) // Do not use strcpy / memcpy because the strings overlap - memmove (Str,&Str[NumLeadingArrobas], - strlen (Str) - NumLeadingArrobas + 1); + memmove (Str,&Str[NumLeadingArr], + strlen (Str) - NumLeadingArr + 1); } } diff --git a/swad_user.c b/swad_user.c index 2b183274..f829b554 100644 --- a/swad_user.c +++ b/swad_user.c @@ -62,6 +62,7 @@ #include "swad_ID.h" #include "swad_language.h" #include "swad_mail_database.h" +#include "swad_message.h" #include "swad_MFU.h" #include "swad_nickname.h" #include "swad_nickname_database.h" @@ -2870,7 +2871,7 @@ void Usr_PutFormLogOut (void) void Usr_GetParamUsrIdLogin (void) { - Par_GetParToText ("UsrId",Gbl.Usrs.Me.UsrIdLogin,Cns_MAX_BYTES_USR_LOGIN); + Par_GetParToText ("UsrId",Gbl.Usrs.Me.UsrIdLogin,sizeof (Gbl.Usrs.Me.UsrIdLogin) - 1); // Users' IDs are always stored internally without leading zeros Str_RemoveLeadingZeros (Gbl.Usrs.Me.UsrIdLogin); } @@ -2884,7 +2885,7 @@ static void Usr_GetParamOtherUsrIDNickOrEMail (void) /***** Get parameter with the plain user's ID, @nick or email of another user *****/ Par_GetParToText ("OtherUsrIDNickOrEMail", Gbl.Usrs.Other.UsrDat.UsrIDNickOrEmail, - Cns_MAX_BYTES_USR_LOGIN); + sizeof (Gbl.Usrs.Other.UsrDat.UsrIDNickOrEmail) - 1); // If it's a user's ID (if does not contain '@') if (strchr (Gbl.Usrs.Other.UsrDat.UsrIDNickOrEmail,(int) '@') != NULL) // '@' not found @@ -6003,7 +6004,7 @@ bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs) /***** Get recipients written explicetely *****/ Par_GetParToText ("OtherRecipients",Gbl.Usrs.ListOtherRecipients, - Nck_MAX_BYTES_LIST_NICKS); + Msg_MAX_BYTES_LIST_OTHER_RECIPIENTS); /***** Add encrypted users' IDs to the list with all selected users *****/ if (Gbl.Usrs.ListOtherRecipients[0]) @@ -6016,7 +6017,7 @@ bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs) while (*Ptr) { /* Find next string in text until comma or semicolon (leading and trailing spaces are removed) */ - Str_GetNextStringUntilComma (&Ptr,UsrIDNickOrEmail,Cns_MAX_BYTES_USR_LOGIN); + Str_GetNextStringUntilComma (&Ptr,UsrIDNickOrEmail,sizeof (UsrIDNickOrEmail) - 1); /* Check if string is plain user's ID or nickname and get encrypted user's ID */ if (UsrIDNickOrEmail[0]) @@ -6356,7 +6357,7 @@ static void Usr_AllocateListOtherRecipients (void) { if (!Gbl.Usrs.ListOtherRecipients) { - if ((Gbl.Usrs.ListOtherRecipients = malloc (Nck_MAX_BYTES_LIST_NICKS + 1)) == NULL) + if ((Gbl.Usrs.ListOtherRecipients = malloc (Msg_MAX_BYTES_LIST_OTHER_RECIPIENTS + 1)) == NULL) Err_NotEnoughMemoryExit (); Gbl.Usrs.ListOtherRecipients[0] = '\0'; } @@ -10170,7 +10171,7 @@ void Usr_DB_RemoveUsrFromBanned (long UsrCod) void Usr_PrintUsrQRCode (void) { - char NewNickWithArr[1 + Cns_MAX_BYTES_USR_LOGIN + 1]; + char NewNickWithArr[1 + Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; if (Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ()) { diff --git a/swad_user.h b/swad_user.h index f0b9881e..35a37960 100644 --- a/swad_user.h +++ b/swad_user.h @@ -172,7 +172,7 @@ struct UsrData struct ListIDs *List; unsigned Num; } IDs; - char Nickname [Cns_MAX_BYTES_USR_LOGIN + 1]; + char Nickname [Nck_MAX_BYTES_NICK_WITHOUT_ARROBA + 1]; char Password [Pwd_BYTES_ENCRYPTED_PASSWORD + 1]; struct {