");
@@ -820,8 +820,8 @@ void Dpt_ChangeDptWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Department *Dpt;
- char Query[256 + Cns_MAX_LENGTH_WWW];
- char NewWWW[Cns_MAX_LENGTH_WWW + 1];
+ char Query[256 + Cns_MAX_BYTES_WWW];
+ char NewWWW[Cns_MAX_BYTES_WWW + 1];
Dpt = &Gbl.Dpts.EditingDpt;
@@ -831,7 +831,7 @@ void Dpt_ChangeDptWWW (void)
Lay_ShowErrorAndExit ("Code of department is missing.");
/* Get the new WWW for the department */
- Par_GetParToText ("WWW",NewWWW,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("WWW",NewWWW,Cns_MAX_BYTES_WWW);
/***** Check if new WWW is empty *****/
if (NewWWW[0])
@@ -854,7 +854,7 @@ void Dpt_ChangeDptWWW (void)
/***** Show the form again *****/
Str_Copy (Dpt->WWW,NewWWW,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
Dpt_EditDepartments ();
}
@@ -949,7 +949,7 @@ static void Dpt_PutFormToCreateDepartment (void)
" required=\"required\" />"
""
"",
- Cns_MAX_LENGTH_WWW,Dpt->WWW);
+ Cns_MAX_CHARS_WWW,Dpt->WWW);
/***** Send button and end of frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_department);
@@ -1025,7 +1025,7 @@ void Dpt_RecFormNewDpt (void)
Par_GetParToText ("FullName",Dpt->FullName,Dpt_MAX_LENGTH_DEPARTMENT_FULL_NAME);
/* Get department WWW */
- Par_GetParToText ("WWW",Dpt->WWW,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("WWW",Dpt->WWW,Cns_MAX_BYTES_WWW);
if (Dpt->ShrtName[0] && Dpt->FullName[0]) // If there's a department name
{
diff --git a/swad_department.h b/swad_department.h
index d7f2ea2c..90013759 100644
--- a/swad_department.h
+++ b/swad_department.h
@@ -40,7 +40,7 @@ struct Department
long InsCod;
char ShrtName[Dpt_MAX_LENGTH_DEPARTMENT_SHRT_NAME + 1];
char FullName[Dpt_MAX_LENGTH_DEPARTMENT_FULL_NAME + 1];
- char WWW[Cns_MAX_LENGTH_WWW + 1];
+ char WWW[Cns_MAX_BYTES_WWW + 1];
unsigned NumTchs;
};
diff --git a/swad_enrollment.c b/swad_enrollment.c
index a0814e67..49e44d8c 100644
--- a/swad_enrollment.c
+++ b/swad_enrollment.c
@@ -1454,7 +1454,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
/***** Find users for this user's ID *****/
ID_ReallocateListIDs (&UsrDat,1); // Only one user's ID
Str_Copy (UsrDat.IDs.List[0].ID,UsrDat.UsrIDNickOrEmail,
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
Str_ConvertToUpperText (UsrDat.IDs.List[0].ID);
ID_GetListUsrCodsFromUsrID (&UsrDat,NULL,&ListUsrCods,false);
}
@@ -1578,7 +1578,7 @@ static void Enr_ReceiveFormUsrsCrs (Rol_Role_t Role)
/* Find users for this user's ID */
ID_ReallocateListIDs (&UsrDat,1); // Only one user's ID
Str_Copy (UsrDat.IDs.List[0].ID,UsrDat.UsrIDNickOrEmail,
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
Str_ConvertToUpperText (UsrDat.IDs.List[0].ID);
ID_GetListUsrCodsFromUsrID (&UsrDat,NULL,&ListUsrCods,false);
}
diff --git a/swad_file_browser.c b/swad_file_browser.c
index 82451d31..09e54fad 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -2500,7 +2500,7 @@ static void Brw_GetParamsPathInTreeAndFileName (void)
if (Gbl.FileBrowser.Level == 1)
// We are in this case: assignments/assignment-folder
Str_Copy (Gbl.FileBrowser.Asg.Folder,Gbl.FileBrowser.FilFolLnkName,
- Asg_MAX_LENGTH_FOLDER);
+ Asg_MAX_BYTES_FOLDER);
else
{
// We are in this case: assignments/assignment-folder/rest-of-path
@@ -2510,7 +2510,7 @@ static void Brw_GetParamsPathInTreeAndFileName (void)
if (*Ptr == '/')
Ptr++; // Skip '/'
for (i = 0;
- i < Asg_MAX_LENGTH_FOLDER && *Ptr && *Ptr != '/';
+ i < Asg_MAX_BYTES_FOLDER && *Ptr && *Ptr != '/';
i++, Ptr++)
Gbl.FileBrowser.Asg.Folder[i] = *Ptr; // Copy assignment folder
Gbl.FileBrowser.Asg.Folder[i] = '\0';
@@ -3191,7 +3191,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
while (*Ptr)
{
Par_GetNextStrUntilSeparParamMult (&Ptr,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&Gbl.Usrs.Other.UsrDat);
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat)) // Get of the database the data of the user
if (Usr_CheckIfUsrBelongsToCrs (Gbl.Usrs.Other.UsrDat.UsrCod,
@@ -5206,7 +5206,7 @@ static bool Brw_WriteRowFileBrowser (unsigned Level,Brw_ExpandTree_t ExpandTree,
if (Level == 1) // Main folder of the assignment
{
Str_Copy (Gbl.FileBrowser.Asg.Folder,FileName,
- Asg_MAX_LENGTH_FOLDER);
+ Asg_MAX_BYTES_FOLDER);
Asg_GetDataOfAssignmentByFolder (&Gbl.FileBrowser.Asg);
// The data of this assignment remains in Gbl.FileBrowser.Asg
// for all subsequent rows with Level > 1 (files or folders inside this folder),
diff --git a/swad_forum.c b/swad_forum.c
index 613793a8..f995a0d5 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -315,8 +315,6 @@ static unsigned For_GetNumOfUnreadPostsInThr (long ThrCod,unsigned NumPostsInThr
static unsigned For_GetNumOfPostsInThrNewerThan (long ThrCod,const char *Time);
static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject);
-static void For_PutSubjectContent (const char *Label,const char *Field,
- unsigned NumRows,const char *Content);
static void For_UpdateNumUsrsNotifiedByEMailAboutPost (long PstCod,unsigned NumUsrsToBeNotifiedByEMail);
static void For_WriteNumberOfThrs (unsigned NumThrs,unsigned NumThrsWithNewPosts);
@@ -472,7 +470,7 @@ static long For_InsertForumPst (long ThrCod,long UsrCod,
if ((Query = malloc (512 +
strlen (Subject) +
strlen (Content) +
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@@ -2296,7 +2294,7 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
unsigned NumThrsWithNewPosts;
unsigned NumPosts;
const char *Style;
- char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
+ char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
/***** Get number of threads and number of posts *****/
NumThrs = For_GetNumThrsInForum (ForumType);
@@ -3866,9 +3864,36 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
/***** Subject and content *****/
// If writing a reply to a message of an existing thread ==> write subject
fprintf (Gbl.F.Out,"
");
/***** Help for text editor *****/
@@ -3887,32 +3912,6 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Lay_EndRoundFrame ();
}
-/*****************************************************************************/
-/****************** Put form field for subject or content ********************/
-/*****************************************************************************/
-
-static void For_PutSubjectContent (const char *Label,const char *Field,
- unsigned NumRows,const char *Content)
- {
- extern const char *The_ClassForm[The_NUM_THEMES];
-
- fprintf (Gbl.F.Out,"
");
- }
-
/*****************************************************************************/
/************************** Receive message of a forum ***********************/
/*****************************************************************************/
diff --git a/swad_global.h b/swad_global.h
index daa5d779..f1fe06f1 100644
--- a/swad_global.h
+++ b/swad_global.h
@@ -97,7 +97,7 @@ struct Globals
{
int Num; // Number of form, used in form submit links
char Id[32]; // Identifier string used in forms
- char UniqueId[32 + Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 10 + 1]; // Unique identifier string used in forms
+ char UniqueId[32 + Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 10 + 1]; // Unique identifier string used in forms
bool Inside; // Set to true inside a form to avoid nested forms
} Form;
bool Error;
@@ -146,7 +146,7 @@ struct Globals
long TimeSendInMicroseconds;
char IP[Cns_MAX_LENGTH_IP + 1];
- char UniqueNameEncrypted[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]; // Used for session id, temporary directory names, etc.
+ char UniqueNameEncrypted[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1]; // Used for session id, temporary directory names, etc.
struct
{
@@ -294,7 +294,7 @@ struct Globals
Rol_Role_t MaxRole;
bool RoleHasChanged; // Set when I have changed my role
char UsrIdLogin[Usr_MAX_BYTES_USR_LOGIN + 1]; // String to store the ID, nickname or email entered in the user's login
- char LoginPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
+ char LoginPlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1];
char LoginEncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
char PendingPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
char PathDir[PATH_MAX + 1];
@@ -466,7 +466,7 @@ struct Globals
struct
{
Inf_InfoType_t Type;
- char URL[Cns_MAX_LENGTH_WWW + 1];
+ char URL[Cns_MAX_BYTES_WWW + 1];
bool MustBeRead[Inf_NUM_INFO_TYPES]; // Students must read info?
bool ShowMsgMustBeRead;
} Info;
diff --git a/swad_image.c b/swad_image.c
index 8f67ba94..0a1e88db 100644
--- a/swad_image.c
+++ b/swad_image.c
@@ -144,7 +144,7 @@ void Img_GetImageNameTitleAndURLFromRow (const char *Name,
/***** Copy image name to struct *****/
Str_Copy (Image->Name,Name,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
/***** Set status of image file *****/
Image->Status = Image->Name[0] ? Img_NAME_STORED_IN_DB :
@@ -197,7 +197,7 @@ void Img_PutImageUploader (int NumImgInForm,const char *ClassImgTitURL)
extern const char *Txt_Image_title_attribution;
extern const char *Txt_Link;
struct ParamUploadImg ParamUploadImg;
- char Id[Act_MAX_LENGTH_ID];
+ char Id[Act_MAX_BYTES_ID];
/***** Set names of parameters depending on number of image in form *****/
Img_SetParamNames (&ParamUploadImg,NumImgInForm);
diff --git a/swad_image.h b/swad_image.h
index 685f0236..9fe39a94 100644
--- a/swad_image.h
+++ b/swad_image.h
@@ -88,7 +88,7 @@ struct Image
{
Img_Action_t Action;
Img_FileStatus_t Status;
- char Name[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1];
+ char Name[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1];
char *Title; // Title/attribution (it must be initialized to NULL
// in order to not trying to free it when no memory allocated)
char *URL; // URL, i.e. link to original big photo or video
diff --git a/swad_info.c b/swad_info.c
index a533ad21..636b9920 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -916,7 +916,7 @@ static bool Inf_CheckURL (long CrsCod,Inf_InfoType_t InfoType)
/***** Check if file with URL exists *****/
if ((FileURL = fopen (PathFile,"rb")))
{
- if (fgets (Gbl.CurrentCrs.Info.URL,Cns_MAX_LENGTH_WWW,FileURL) == NULL)
+ if (fgets (Gbl.CurrentCrs.Info.URL,Cns_MAX_BYTES_WWW,FileURL) == NULL)
Gbl.CurrentCrs.Info.URL[0] = '\0';
/* File is not longer needed ==> close it */
fclose (FileURL);
@@ -944,7 +944,7 @@ static bool Inf_CheckAndShowURL (void)
/***** Check if file with URL exists *****/
if ((FileURL = fopen (PathFile,"rb")))
{
- if (fgets (Gbl.CurrentCrs.Info.URL,Cns_MAX_LENGTH_WWW,FileURL) == NULL)
+ if (fgets (Gbl.CurrentCrs.Info.URL,Cns_MAX_BYTES_WWW,FileURL) == NULL)
Gbl.CurrentCrs.Info.URL[0] = '\0';
/* File is not longer needed ==> close it */
fclose (FileURL);
@@ -975,7 +975,7 @@ static void Inf_BuildPathURL (long CrsCod,Inf_InfoType_t InfoType,char *PathFile
/*****************************************************************************/
// This function is called only from web service
-void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_LENGTH_WWW + 1])
+void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_BYTES_WWW + 1])
{
char PathFile[PATH_MAX + 1];
FILE *FileURL;
@@ -989,7 +989,7 @@ void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_LENGTH_WWW + 1])
/***** Check if file with URL exists *****/
if ((FileURL = fopen (PathFile,"rb")))
{
- if (fgets (TxtBuffer,Cns_MAX_LENGTH_WWW,FileURL) == NULL)
+ if (fgets (TxtBuffer,Cns_MAX_BYTES_WWW,FileURL) == NULL)
TxtBuffer[0] = '\0';
/* File is not longer needed ==> close it */
fclose (FileURL);
@@ -1295,7 +1295,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc)
fprintf (Gbl.F.Out,"http://");
else
{
- if (fgets (Gbl.CurrentCrs.Info.URL,Cns_MAX_LENGTH_WWW,FileURL) == NULL)
+ if (fgets (Gbl.CurrentCrs.Info.URL,Cns_MAX_BYTES_WWW,FileURL) == NULL)
Gbl.CurrentCrs.Info.URL[0] = '\0';
/* File is not needed now. Close it */
fclose (FileURL);
@@ -2206,7 +2206,7 @@ void Inf_ReceiveURLInfo (void)
Gbl.CurrentCrs.Info.Type = Inf_AsignInfoType ();
/***** Get parameter with URL *****/
- Par_GetParToText ("InfoSrcURL",Gbl.CurrentCrs.Info.URL,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("InfoSrcURL",Gbl.CurrentCrs.Info.URL,Cns_MAX_BYTES_WWW);
/***** Build path to file containing URL *****/
Inf_BuildPathURL (Gbl.CurrentCrs.Crs.CrsCod,Gbl.CurrentCrs.Info.Type,PathFile);
diff --git a/swad_info.h b/swad_info.h
index 0c89b301..818fd47a 100644
--- a/swad_info.h
+++ b/swad_info.h
@@ -75,7 +75,7 @@ void Inf_ChangeIHaveReadInfo (void);
bool Inf_GetIfIMustReadAnyCrsInfoInThisCrs (void);
void Inf_RemoveUsrFromCrsInfoRead (long UsrCod,long CrsCod);
int Inf_WritePageIntoHTMLBuffer (char **HTMLBuffer);
-void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_LENGTH_WWW + 1]);
+void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_BYTES_WWW + 1]);
void Inf_SetInfoSrc (void);
void Inf_FormsToSelSendInfo (void);
void Inf_FormToEnterIntegratedEditor (Inf_InfoSrc_t InfoSrc);
diff --git a/swad_institution.c b/swad_institution.c
index 553f0011..ad2f4fe4 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -90,7 +90,7 @@ static void Ins_RenameInstitution (struct Instit *Ins,Cns_ShrtOrFullName_t ShrtO
static bool Ins_CheckIfInsNameExistsInCty (const char *FieldName,const char *Name,long InsCod,long CtyCod);
static void Ins_UpdateInsNameDB (long InsCod,const char *FieldName,const char *NewInsName);
static void Ins_UpdateInsCtyDB (long InsCod,long CtyCod);
-static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_LENGTH_WWW + 1]);
+static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_BYTES_WWW + 1]);
static void Ins_PutButtonToGoToIns (struct Instit *Ins);
static void Ins_PutFormToCreateInstitution (void);
@@ -443,7 +443,7 @@ static void Ins_Configuration (bool PrintView)
" maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_WWW\""
" onchange=\"document.getElementById('%s').submit();\" />",
- Cns_MAX_LENGTH_WWW,
+ Cns_MAX_CHARS_WWW,
Gbl.CurrentIns.Ins.WWW,
Gbl.Form.Id);
Act_FormEnd ();
@@ -1038,7 +1038,7 @@ void Ins_GetListInstitutions (long CtyCod,Ins_GetExtraData_t GetExtraData)
/* Get the URL of the institution (row[6]) */
Str_Copy (Ins->WWW,row[6],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
/* Get extra data */
switch (GetExtraData)
@@ -1153,7 +1153,7 @@ bool Ins_GetDataOfInstitutionByCod (struct Instit *Ins,
/* Get the URL of the institution (row[5]) */
Str_Copy (Ins->WWW,row[5],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
/* Get extra data */
if (GetExtraData == Ins_GET_EXTRA_DATA)
@@ -1390,7 +1390,7 @@ static void Ins_ListInstitutionsForEdition (void)
extern const char *Txt_INSTITUTION_STATUS[Ins_NUM_STATUS_TXT];
unsigned NumIns;
struct Instit *Ins;
- char WWW[Cns_MAX_LENGTH_WWW + 1];
+ char WWW[Cns_MAX_BYTES_WWW + 1];
struct UsrData UsrDat;
bool ICanEdit;
Ins_StatusTxt_t StatusTxt;
@@ -1490,7 +1490,7 @@ static void Ins_ListInstitutionsForEdition (void)
" maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_WWW\""
" onchange=\"document.getElementById('%s').submit();\" />",
- Cns_MAX_LENGTH_WWW,
+ Cns_MAX_CHARS_WWW,
Ins->WWW,
Gbl.Form.Id);
Act_FormEnd ();
@@ -1499,7 +1499,7 @@ static void Ins_ListInstitutionsForEdition (void)
else
{
Str_Copy (WWW,Ins->WWW,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
fprintf (Gbl.F.Out,"
"
"
"
@@ -1945,7 +1945,7 @@ void Ins_ChangeInsWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Instit *Ins;
- char NewWWW[Cns_MAX_LENGTH_WWW + 1];
+ char NewWWW[Cns_MAX_BYTES_WWW + 1];
Ins = &Gbl.Inss.EditingIns;
@@ -1954,7 +1954,7 @@ void Ins_ChangeInsWWW (void)
Ins->InsCod = Ins_GetAndCheckParamOtherInsCod ();
/* Get the new WWW for the institution */
- Par_GetParToText ("WWW",NewWWW,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("WWW",NewWWW,Cns_MAX_BYTES_WWW);
/***** Get data of institution *****/
Ins_GetDataOfInstitutionByCod (Ins,Ins_GET_BASIC_DATA);
@@ -1965,7 +1965,7 @@ void Ins_ChangeInsWWW (void)
/***** Update database changing old WWW by new WWW *****/
Ins_UpdateInsWWWDB (Ins->InsCod,NewWWW);
Str_Copy (Ins->WWW,NewWWW,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
/***** Write message to show the change made *****/
sprintf (Gbl.Message,Txt_The_new_web_address_is_X,NewWWW);
@@ -1985,11 +1985,11 @@ void Ins_ChangeInsWWWInConfig (void)
{
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
- char NewWWW[Cns_MAX_LENGTH_WWW + 1];
+ char NewWWW[Cns_MAX_BYTES_WWW + 1];
/***** Get parameters from form *****/
/* Get the new WWW for the institution */
- Par_GetParToText ("WWW",NewWWW,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("WWW",NewWWW,Cns_MAX_BYTES_WWW);
/***** Check if new WWW is empty *****/
if (NewWWW[0])
@@ -1997,7 +1997,7 @@ void Ins_ChangeInsWWWInConfig (void)
/***** Update database changing old WWW by new WWW *****/
Ins_UpdateInsWWWDB (Gbl.CurrentIns.Ins.InsCod,NewWWW);
Str_Copy (Gbl.CurrentIns.Ins.WWW,NewWWW,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
/***** Write message to show the change made *****/
sprintf (Gbl.Message,Txt_The_new_web_address_is_X,NewWWW);
@@ -2014,9 +2014,9 @@ void Ins_ChangeInsWWWInConfig (void)
/**************** Update database changing old WWW by new WWW ****************/
/*****************************************************************************/
-static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_LENGTH_WWW + 1])
+static void Ins_UpdateInsWWWDB (long InsCod,const char NewWWW[Cns_MAX_BYTES_WWW + 1])
{
- char Query[256 + Cns_MAX_LENGTH_WWW];
+ char Query[256 + Cns_MAX_BYTES_WWW];
/***** Update database changing old WWW by new WWW *****/
sprintf (Query,"UPDATE institutions SET WWW='%s' WHERE InsCod='%ld'",
@@ -2214,7 +2214,7 @@ static void Ins_PutFormToCreateInstitution (void)
" class=\"INPUT_WWW\""
" required=\"required\" />"
"",
- Cns_MAX_LENGTH_WWW,Ins->WWW);
+ Cns_MAX_CHARS_WWW,Ins->WWW);
/***** Number of users who claim to belong to this institution ****/
fprintf (Gbl.F.Out," "
@@ -2355,7 +2355,7 @@ static void Ins_RecFormRequestOrCreateIns (unsigned Status)
Par_GetParToText ("FullName",Ins->FullName,Ins_MAX_LENGTH_INSTIT_FULL_NAME);
/* Get institution WWW */
- Par_GetParToText ("WWW",Ins->WWW,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("WWW",Ins->WWW,Cns_MAX_BYTES_WWW);
if (Ins->ShrtName[0] && Ins->FullName[0]) // If there's a institution name
{
@@ -2397,7 +2397,7 @@ static void Ins_CreateInstitution (struct Instit *Ins,unsigned Status)
char Query[512 +
Ins_MAX_LENGTH_INSTIT_SHRT_NAME +
Ins_MAX_LENGTH_INSTIT_FULL_NAME +
- Cns_MAX_LENGTH_WWW];
+ Cns_MAX_BYTES_WWW];
/***** Create a new institution *****/
sprintf (Query,"INSERT INTO institutions (CtyCod,Status,RequesterUsrCod,"
diff --git a/swad_institution.h b/swad_institution.h
index f98916ca..f5ce38b0 100644
--- a/swad_institution.h
+++ b/swad_institution.h
@@ -66,7 +66,7 @@ struct Instit
long RequesterUsrCod; // User code of the person who requested the creation of this institution
char ShrtName[Ins_MAX_LENGTH_INSTIT_SHRT_NAME + 1];
char FullName[Ins_MAX_LENGTH_INSTIT_FULL_NAME + 1];
- char WWW[Cns_MAX_LENGTH_WWW + 1];
+ char WWW[Cns_MAX_BYTES_WWW + 1];
unsigned NumUsrsWhoClaimToBelongToIns;
unsigned NumCtrs;
unsigned NumDegs;
diff --git a/swad_link.c b/swad_link.c
index 42b42333..51517ada 100644
--- a/swad_link.c
+++ b/swad_link.c
@@ -241,7 +241,7 @@ void Lnk_GetListLinks (void)
/* Get the URL of the link (row[3]) */
Str_Copy (Lnk->WWW,row[3],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
}
}
else
@@ -289,7 +289,7 @@ void Lnk_GetDataOfLinkByCod (struct Link *Lnk)
/* Get the URL of the link (row[2]) */
Str_Copy (Lnk->WWW,row[2],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
}
/***** Free structure that stores the query result *****/
@@ -384,7 +384,7 @@ static void Lnk_ListLinksForEdition (void)
" maxlength=\"%u\" value=\"%s\""
" class=\"INPUT_WWW\""
" onchange=\"document.getElementById('%s').submit();\" />",
- Cns_MAX_LENGTH_WWW,Lnk->WWW,
+ Cns_MAX_CHARS_WWW,Lnk->WWW,
Gbl.Form.Id);
Act_FormEnd ();
fprintf (Gbl.F.Out," "
@@ -576,8 +576,8 @@ void Lnk_ChangeLinkWWW (void)
extern const char *Txt_The_new_web_address_is_X;
extern const char *Txt_You_can_not_leave_the_web_address_empty;
struct Link *Lnk;
- char Query[256 + Cns_MAX_LENGTH_WWW];
- char NewWWW[Cns_MAX_LENGTH_WWW + 1];
+ char Query[256 + Cns_MAX_BYTES_WWW];
+ char NewWWW[Cns_MAX_BYTES_WWW + 1];
Lnk = &Gbl.Links.EditingLnk;
@@ -587,7 +587,7 @@ void Lnk_ChangeLinkWWW (void)
Lay_ShowErrorAndExit ("Code of institutional link is missing.");
/* Get the new WWW for the link */
- Par_GetParToText ("WWW",NewWWW,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("WWW",NewWWW,Cns_MAX_BYTES_WWW);
/***** Check if new WWW is empty *****/
if (NewWWW[0])
@@ -607,7 +607,7 @@ void Lnk_ChangeLinkWWW (void)
/***** Show the form again *****/
Str_Copy (Lnk->WWW,NewWWW,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
Lnk_EditLinks ();
}
@@ -664,7 +664,7 @@ static void Lnk_PutFormToCreateLink (void)
" required=\"required\" />"
""
"",
- Cns_MAX_LENGTH_WWW,Lnk->WWW);
+ Cns_MAX_CHARS_WWW,Lnk->WWW);
/***** Send button and end frame *****/
Lay_EndRoundFrameTableWithButton (Lay_CREATE_BUTTON,Txt_Create_link);
@@ -726,7 +726,7 @@ void Lnk_RecFormNewLink (void)
Par_GetParToText ("FullName",Lnk->FullName,Lnk_MAX_LENGTH_LINK_FULL_NAME);
/* Get link URL */
- Par_GetParToText ("WWW",Lnk->WWW,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("WWW",Lnk->WWW,Cns_MAX_BYTES_WWW);
if (Lnk->ShrtName[0] && Lnk->FullName[0]) // If there's a link name
{
diff --git a/swad_link.h b/swad_link.h
index 15bfc9c3..cddfbaa3 100644
--- a/swad_link.h
+++ b/swad_link.h
@@ -39,7 +39,7 @@ struct Link
long LnkCod;
char ShrtName[Lnk_MAX_LENGTH_LINK_SHRT_NAME + 1];
char FullName[Lnk_MAX_LENGTH_LINK_FULL_NAME + 1];
- char WWW[Cns_MAX_LENGTH_WWW + 1];
+ char WWW[Cns_MAX_BYTES_WWW + 1];
};
/*****************************************************************************/
diff --git a/swad_mail.c b/swad_mail.c
index 50b7cdc4..9312138f 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -50,7 +50,7 @@ extern struct Globals Gbl;
/***************************** Private constants *****************************/
/*****************************************************************************/
-#define Mai_LENGTH_EMAIL_CONFIRM_KEY Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64
+#define Mai_LENGTH_EMAIL_CONFIRM_KEY Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64
/*****************************************************************************/
/******************************* Private types *******************************/
diff --git a/swad_mark.c b/swad_mark.c
index 79c65de3..e89300ec 100644
--- a/swad_mark.c
+++ b/swad_mark.c
@@ -406,7 +406,7 @@ bool Mrk_CheckFileOfMarks (const char *Path,struct MarksProperties *Marks)
static bool Mrk_CheckIfCellContainsOnlyIDs (const char *CellContent)
{
- char UsrIDFromTable[ID_MAX_LENGTH_USR_ID + 1];
+ char UsrIDFromTable[ID_MAX_BYTES_USR_ID + 1];
const char *Ptr = CellContent;
bool UsrIDFound = false;
bool StuffNotUsrIDFound = false;
@@ -416,7 +416,7 @@ static bool Mrk_CheckIfCellContainsOnlyIDs (const char *CellContent)
while (*Ptr && !StuffNotUsrIDFound)
{
/* Find next string in text until space, comma or semicolon (leading and trailing spaces are removed) */
- Str_GetNextStringUntilSeparator (&Ptr,UsrIDFromTable,ID_MAX_LENGTH_USR_ID);
+ Str_GetNextStringUntilSeparator (&Ptr,UsrIDFromTable,ID_MAX_BYTES_USR_ID);
// Users' IDs are always stored internally in capitals and without leading zeros
Str_RemoveLeadingZeros (UsrIDFromTable);
@@ -447,7 +447,7 @@ static bool Mrk_GetUsrMarks (FILE *FileUsrMarks,struct UsrData *UsrDat,
unsigned Row;
char CellContent[Mrk_MAX_BYTES_IN_CELL_CONTENT + 1];
const char *Ptr;
- char UsrIDFromTable[ID_MAX_LENGTH_USR_ID + 1];
+ char UsrIDFromTable[ID_MAX_BYTES_USR_ID + 1];
FILE *FileAllMarks;
unsigned NumID;
bool UsrIDFound;
@@ -484,7 +484,7 @@ static bool Mrk_GetUsrMarks (FILE *FileUsrMarks,struct UsrData *UsrDat,
while (*Ptr && !UsrIDFound)
{
/* Find next string in text until comma or semicolon (leading and trailing spaces are removed) */
- Str_GetNextStringUntilSeparator (&Ptr,UsrIDFromTable,ID_MAX_LENGTH_USR_ID);
+ Str_GetNextStringUntilSeparator (&Ptr,UsrIDFromTable,ID_MAX_BYTES_USR_ID);
// Users' IDs are always stored internally in capitals and without leading zeros
Str_RemoveLeadingZeros (UsrIDFromTable);
@@ -534,7 +534,7 @@ static bool Mrk_GetUsrMarks (FILE *FileUsrMarks,struct UsrData *UsrDat,
while (*Ptr && !UsrIDFound)
{
/* Find next string in text until comma or semicolon (leading and trailing spaces are removed) */
- Str_GetNextStringUntilSeparator (&Ptr,UsrIDFromTable,ID_MAX_LENGTH_USR_ID);
+ Str_GetNextStringUntilSeparator (&Ptr,UsrIDFromTable,ID_MAX_BYTES_USR_ID);
// Users' IDs are always stored internally in capitals and without leading zeros
Str_RemoveLeadingZeros (UsrIDFromTable);
diff --git a/swad_message.c b/swad_message.c
index cdab5c11..f2ad5b9b 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -420,7 +420,7 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void)
extern const char *Txt_Other_recipients;
extern const char *Txt_Recipients;
extern const char *Txt_nicks_emails_or_IDs_separated_by_commas;
- char Nickname[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1];
+ char Nickname[Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1];
unsigned Colspan;
bool StdsAndTchsWritten = Gbl.CurrentCrs.Crs.CrsCod > 0 && // If there is a course selected
(Gbl.Usrs.Me.IBelongToCurrentCrs || // I belong to it
@@ -728,7 +728,7 @@ void Msg_RecMsgFromUsr (void)
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDstData.EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDstData.EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&UsrDstData);
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDstData)) // Get recipient's data from the database
{
@@ -1298,7 +1298,7 @@ static long Msg_InsertNewMsg (const char *Subject,const char *Content,
if ((Query = malloc (512 +
strlen (Subject) +
strlen (Content) +
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
diff --git a/swad_network.c b/swad_network.c
index bc050a10..df62fa33 100644
--- a/swad_network.c
+++ b/swad_network.c
@@ -204,7 +204,7 @@ void Net_ShowWebsAndSocialNets (const struct UsrData *UsrDat)
MYSQL_RES *mysql_res;
MYSQL_ROW row;
Net_WebsAndSocialNetworks_t NumURL;
- char URL[Cns_MAX_LENGTH_WWW + 1];
+ char URL[Cns_MAX_BYTES_WWW + 1];
/***** Start container *****/
fprintf (Gbl.F.Out,"
");
@@ -229,7 +229,7 @@ void Net_ShowWebsAndSocialNets (const struct UsrData *UsrDat)
/* Get URL */
row = mysql_fetch_row (mysql_res);
Str_Copy (URL,row[0],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
/* Show the web / social network */
Net_ShowAWebOrSocialNet (URL,
@@ -296,7 +296,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
MYSQL_RES *mysql_res;
MYSQL_ROW row;
Net_WebsAndSocialNetworks_t NumURL;
- char URL[Cns_MAX_LENGTH_WWW + 1];
+ char URL[Cns_MAX_BYTES_WWW + 1];
/***** Start table *****/
Lay_StartRoundFrameTable (NULL,Txt_Webs_social_networks,
@@ -320,7 +320,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
/* Get URL */
Str_Copy (URL,row[0],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
}
else
URL[0] = '\0';
@@ -352,7 +352,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
" maxlength=\"%u\" value=\"%s\" style=\"width:%upx;\""
" onchange=\"document.getElementById('%s').submit();\" />",
(unsigned) NumURL,
- Cns_MAX_LENGTH_WWW,URL,Net_COL2_WIDTH - 20,
+ Cns_MAX_CHARS_WWW,URL,Net_COL2_WIDTH - 20,
Gbl.Form.Id);
Act_FormEnd ();
fprintf (Gbl.F.Out,""
@@ -393,9 +393,9 @@ void Net_UpdateMyWebsAndSocialNets (void)
static void Net_GetMyWebsAndSocialNetsFromForm (void)
{
- char Query[256 + Cns_MAX_LENGTH_WWW];
+ char Query[256 + Cns_MAX_BYTES_WWW];
Net_WebsAndSocialNetworks_t Web;
- char URL[Cns_MAX_LENGTH_WWW + 1];
+ char URL[Cns_MAX_BYTES_WWW + 1];
/***** Get parameter with the type of web / social network *****/
Web = (Net_WebsAndSocialNetworks_t)
@@ -405,7 +405,7 @@ static void Net_GetMyWebsAndSocialNetsFromForm (void)
(unsigned long) Net_WEB_SOCIAL_NET_DEFAULT);
/***** Get URL *****/
- Par_GetParToText ("URL",URL,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("URL",URL,Cns_MAX_BYTES_WWW);
if (URL[0])
{
/***** Insert or replace web / social network *****/
diff --git a/swad_nickname.c b/swad_nickname.c
index f3a1d9d6..3a730833 100644
--- a/swad_nickname.c
+++ b/swad_nickname.c
@@ -79,9 +79,9 @@ bool Nck_CheckIfNickWithArrobaIsValid (const char *NicknameWithArroba)
Length = strlen (NicknameWithoutArroba);
/***** A nick (without arroba) must have a number of characters
- Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA <= Length <= Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA *****/
- if (Length < Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA ||
- Length > Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA)
+ Nck_MIN_BYTES_NICKNAME_WITHOUT_ARROBA <= Length <= Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA *****/
+ if (Length < Nck_MIN_BYTES_NICKNAME_WITHOUT_ARROBA ||
+ Length > Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA)
return false;
/***** A nick can have digits, letters and '_' *****/
@@ -102,7 +102,7 @@ bool Nck_CheckIfNickWithArrobaIsValid (const char *NicknameWithArroba)
/*****************************************************************************/
bool Nck_GetNicknameFromUsrCod (long UsrCod,
- char Nickname[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1])
+ char Nickname[Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1])
{
char Query[256];
MYSQL_RES *mysql_res;
@@ -118,7 +118,7 @@ bool Nck_GetNicknameFromUsrCod (long UsrCod,
/* Get nickname */
row = mysql_fetch_row (mysql_res);
Str_Copy (Nickname,row[0],
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
Found = true;
}
else
@@ -289,7 +289,7 @@ void Nck_ShowFormChangeUsrNickname (void)
" "
"
",
- 1 + Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA,
+ 1 + Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA,
Gbl.Usrs.Me.UsrDat.Nickname);
Lay_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname
Txt_Save); // I have no nickname yet);
@@ -306,10 +306,10 @@ void Nck_RemoveNick (void)
{
extern const char *Txt_Nickname_X_removed;
extern const char *Txt_You_can_not_delete_your_current_nickname;
- char NicknameWithoutArroba[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1];
+ char NicknameWithoutArroba[Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1];
/***** Get new nickname from form *****/
- Par_GetParToText ("Nick",NicknameWithoutArroba,Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Par_GetParToText ("Nick",NicknameWithoutArroba,Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
if (strcasecmp (NicknameWithoutArroba,Gbl.Usrs.Me.UsrDat.Nickname)) // Only if not my current nickname
{
@@ -398,7 +398,7 @@ void Nck_UpdateNick (void)
// Now we know the new nickname is not already in database and is diffent to the current one
Nck_UpdateMyNick (NewNicknameWithoutArroba);
Str_Copy (Gbl.Usrs.Me.UsrDat.Nickname,NewNicknameWithoutArroba,
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
sprintf (Gbl.Message,Txt_Your_nickname_X_has_been_registered_successfully,
NewNicknameWithoutArroba);
@@ -409,8 +409,8 @@ void Nck_UpdateNick (void)
Error = true;
sprintf (Gbl.Message,Txt_The_nickname_entered_X_is_not_valid_,
NewNicknameWithArroba,
- Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA,
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MIN_CHARS_NICKNAME_WITHOUT_ARROBA,
+ Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA);
}
/***** Show message *****/
diff --git a/swad_nickname.h b/swad_nickname.h
index 58c73710..9543bbf8 100644
--- a/swad_nickname.h
+++ b/swad_nickname.h
@@ -32,8 +32,11 @@
/************************* Public types and constants ************************/
/*****************************************************************************/
-#define Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA 3
-#define Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA 16
+#define Nck_MIN_CHARS_NICKNAME_WITHOUT_ARROBA 3
+#define Nck_MIN_BYTES_NICKNAME_WITHOUT_ARROBA Nck_MIN_CHARS_NICKNAME_WITHOUT_ARROBA
+
+#define Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA 16
+#define Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA
#define Nck_MAX_BYTES_NICKNAME_FROM_FORM (128 - 1) // For variables that store characters typed in a form
@@ -46,7 +49,7 @@
bool Nck_CheckIfNickWithArrobaIsValid (const char *NicknameWithArroba);
bool Nck_GetNicknameFromUsrCod (long UsrCod,
- char Nickname[Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1]);
+ char Nickname[Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1]);
long Nck_GetUsrCodFromNickname (const char *Nickname);
void Nck_ShowFormChangeUsrNickname (void);
diff --git a/swad_parameter.c b/swad_parameter.c
index 56652a6c..56bc640c 100644
--- a/swad_parameter.c
+++ b/swad_parameter.c
@@ -686,7 +686,7 @@ void Par_GetMainParameters (void)
/* Set another user's nickname */
Str_RemoveLeadingArrobas (Nickname);
Str_Copy (Gbl.Usrs.Other.UsrDat.Nickname,Nickname, // without arroba
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
// This user's code is used to go to public profile
// and to refresh old publishings in user's timeline
@@ -702,7 +702,7 @@ void Par_GetMainParameters (void)
/* Set another user's nickname */
Str_RemoveLeadingArrobas (Nickname);
Str_Copy (Gbl.Usrs.Other.UsrDat.Nickname,Nickname, // without arroba
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
// This user's code is used to go to public agenda
// If user does not exist ==> UsrCod = -1
diff --git a/swad_password.c b/swad_password.c
index 8e4d87d1..47fcad10 100644
--- a/swad_password.c
+++ b/swad_password.c
@@ -67,7 +67,7 @@ extern struct Globals Gbl;
static void Pwd_PutLinkToSendNewPasswdParams (void);
-static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1]);
+static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1]);
static bool Pwd_CheckIfPasswdIsUsrIDorName (const char *PlainPassword);
static unsigned Pwd_GetNumOtherUsrsWhoUseThisPassword (const char *EncryptedPassword,long UsrCod);
@@ -79,7 +79,8 @@ static unsigned Pwd_GetNumOtherUsrsWhoUseThisPassword (const char *EncryptedPass
void Pwd_GetParamUsrPwdLogin (void)
{
/***** Get plain password from form *****/
- Par_GetParToText ("UsrPwd",Gbl.Usrs.Me.LoginPlainPassword,Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+ Par_GetParToText ("UsrPwd",Gbl.Usrs.Me.LoginPlainPassword,
+ Pwd_MAX_BYTES_PLAIN_PASSWORD);
/***** Encrypt password *****/
Cry_EncryptSHA512Base64 (Gbl.Usrs.Me.LoginPlainPassword,Gbl.Usrs.Me.LoginEncryptedPassword);
@@ -160,12 +161,12 @@ void Pwd_ActChgMyPwd1 (void)
extern const char *Txt_You_have_not_written_twice_the_same_new_password;
extern const char *Txt_Your_password_has_been_changed_successfully;
extern const char *Txt_You_have_not_entered_your_password_correctly;
- char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
- char NewPlainPassword[2][Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
+ char PlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1];
+ char NewPlainPassword[2][Pwd_MAX_BYTES_PLAIN_PASSWORD + 1];
char NewEncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
/***** Get plain password from form *****/
- Par_GetParToText ("UsrPwd",PlainPassword,Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+ Par_GetParToText ("UsrPwd",PlainPassword,Pwd_MAX_BYTES_PLAIN_PASSWORD);
/***** Encrypt password *****/
Cry_EncryptSHA512Base64 (PlainPassword,Gbl.Usrs.Me.LoginEncryptedPassword);
@@ -173,8 +174,8 @@ void Pwd_ActChgMyPwd1 (void)
Gbl.Usrs.Error = true;
if (Pwd_CheckCurrentPassword ())
{
- Par_GetParToText ("Paswd1",NewPlainPassword[0],Pwd_MAX_LENGTH_PLAIN_PASSWORD);
- Par_GetParToText ("Paswd2",NewPlainPassword[1],Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+ Par_GetParToText ("Paswd1",NewPlainPassword[0],Pwd_MAX_BYTES_PLAIN_PASSWORD);
+ Par_GetParToText ("Paswd2",NewPlainPassword[1],Pwd_MAX_BYTES_PLAIN_PASSWORD);
/***** Check if I have written twice the same password *****/
if (strcmp (NewPlainPassword[0],NewPlainPassword[1]))
@@ -183,7 +184,7 @@ void Pwd_ActChgMyPwd1 (void)
else
{
Str_ChangeFormat (Str_FROM_FORM,Str_TO_TEXT,
- NewPlainPassword[0],Pwd_MAX_LENGTH_PLAIN_PASSWORD,true);
+ NewPlainPassword[0],Pwd_MAX_BYTES_PLAIN_PASSWORD,true);
Cry_EncryptSHA512Base64 (NewPlainPassword[0],NewEncryptedPassword);
if (Pwd_SlowCheckIfPasswordIsGood (NewPlainPassword[0],NewEncryptedPassword,Gbl.Usrs.Me.UsrDat.UsrCod)) // New password is good?
{
@@ -280,7 +281,7 @@ void Pwd_ChkIdLoginAndSendNewPwd (void)
extern const char *Txt_If_you_have_written_your_ID_nickname_or_email_correctly_;
extern const char *Txt_There_are_more_than_one_user_with_the_ID_X_Please_type_a_nick_or_email;
struct ListUsrCods ListUsrCods;
- char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
+ char NewRandomPlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1];
int ReturnCode;
/***** Check if user's ID or nickname is not empty *****/
@@ -328,7 +329,7 @@ void Pwd_ChkIdLoginAndSendNewPwd (void)
// User has typed a user's ID
Str_Copy (Gbl.Usrs.Me.UsrDat.IDs.List[0].ID,Gbl.Usrs.Me.UsrIdLogin,
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
Str_ConvertToUpperText (Gbl.Usrs.Me.UsrDat.IDs.List[0].ID);
/* Get users' codes for this ID */
@@ -391,7 +392,7 @@ void Pwd_ChkIdLoginAndSendNewPwd (void)
// Gbl.Usrs.Me.UsrDat must be filled
// Return code returned by command
-int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1])
+int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1])
{
extern const char *Txt_The_following_password_has_been_assigned_to_you_to_log_in_X_NO_HTML;
extern const char *Txt_New_password_NO_HTML[1 + Txt_NUM_LANGUAGES];
@@ -445,16 +446,16 @@ int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN
/*********************** Create a new random password ************************/
/*****************************************************************************/
-static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1])
+static void Pwd_CreateANewPassword (char PlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1])
{
- Str_CreateRandomAlphanumStr (PlainPassword,Pwd_MIN_LENGTH_PLAIN_PASSWORD);
+ Str_CreateRandomAlphanumStr (PlainPassword,Pwd_MIN_CHARS_PLAIN_PASSWORD);
}
/*****************************************************************************/
/*************************** Set my pending password *************************/
/*****************************************************************************/
-void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1])
+void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1])
{
char Query[512];
@@ -483,7 +484,7 @@ void Pwd_UpdateOtherPwd1 (void)
extern const char *Txt_You_have_not_written_twice_the_same_new_password;
extern const char *Txt_The_X_password_has_been_changed_successfully;
extern const char *Txt_User_not_found_or_you_do_not_have_permission_;
- char NewPlainPassword[2][Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
+ char NewPlainPassword[2][Pwd_MAX_BYTES_PLAIN_PASSWORD + 1];
char NewEncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
Gbl.Usrs.Error = true;
@@ -493,8 +494,8 @@ void Pwd_UpdateOtherPwd1 (void)
{
if (Usr_ICanEditOtherUsr (&Gbl.Usrs.Other.UsrDat))
{
- Par_GetParToText ("Paswd1",NewPlainPassword[0],Pwd_MAX_LENGTH_PLAIN_PASSWORD);
- Par_GetParToText ("Paswd2",NewPlainPassword[1],Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+ Par_GetParToText ("Paswd1",NewPlainPassword[0],Pwd_MAX_BYTES_PLAIN_PASSWORD);
+ Par_GetParToText ("Paswd2",NewPlainPassword[1],Pwd_MAX_BYTES_PLAIN_PASSWORD);
if (strcmp (NewPlainPassword[0],NewPlainPassword[1]))
// Paswords don't match
@@ -502,7 +503,7 @@ void Pwd_UpdateOtherPwd1 (void)
else
{
Str_ChangeFormat (Str_FROM_FORM,Str_TO_TEXT,
- NewPlainPassword[0],Pwd_MAX_LENGTH_PLAIN_PASSWORD,true);
+ NewPlainPassword[0],Pwd_MAX_BYTES_PLAIN_PASSWORD,true);
Cry_EncryptSHA512Base64 (NewPlainPassword[0],NewEncryptedPassword);
if (Pwd_SlowCheckIfPasswordIsGood (NewPlainPassword[0],NewEncryptedPassword,Gbl.Usrs.Other.UsrDat.UsrCod)) // Good password
{
@@ -578,7 +579,7 @@ bool Pwd_SlowCheckIfPasswordIsGood (const char *PlainPassword,
static bool Pwd_CheckIfPasswdIsUsrIDorName (const char *PlainPassword)
{
- char Query[128 + 3 * Pwd_MAX_LENGTH_PLAIN_PASSWORD];
+ char Query[128 + 3 * Pwd_MAX_BYTES_PLAIN_PASSWORD];
bool Found;
/***** Get if password is found in user's ID from database *****/
@@ -632,10 +633,10 @@ bool Pwd_FastCheckIfPasswordSeemsGood (const char *PlainPassword)
bool ItsANumber;
/***** Check length of password *****/
- if (LengthPassword < Pwd_MIN_LENGTH_PLAIN_PASSWORD) // PlainPassword too short
+ if (LengthPassword < Pwd_MIN_BYTES_PLAIN_PASSWORD) // PlainPassword too short
{
sprintf (Gbl.Message,Txt_The_password_must_be_at_least_X_characters,
- Pwd_MIN_LENGTH_PLAIN_PASSWORD);
+ Pwd_MIN_CHARS_PLAIN_PASSWORD);
return false;
}
@@ -708,13 +709,13 @@ void Pwd_ShowFormChgPwd (void)
"",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Current_password,
- Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+ Pwd_MAX_CHARS_PLAIN_PASSWORD);
/* Help message */
fprintf (Gbl.F.Out,"
"
"");
sprintf (Gbl.Message,Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_,
- Pwd_MIN_LENGTH_PLAIN_PASSWORD);
+ Pwd_MIN_CHARS_PLAIN_PASSWORD);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
fprintf (Gbl.F.Out," "
" ");
@@ -741,7 +742,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
extern const char *Txt_Password;
extern const char *Txt_HELP_password;
- sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_LENGTH_PLAIN_PASSWORD);
+ sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_CHARS_PLAIN_PASSWORD);
fprintf (Gbl.F.Out,"
"
""
"%s: "
@@ -754,7 +755,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
" ",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Password,
- Pwd_MAX_LENGTH_PLAIN_PASSWORD,
+ Pwd_MAX_CHARS_PLAIN_PASSWORD,
Gbl.Message);
}
@@ -769,7 +770,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
extern const char *Txt_HELP_password;
extern const char *Txt_Retype_new_password;
- sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_LENGTH_PLAIN_PASSWORD);
+ sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_CHARS_PLAIN_PASSWORD);
fprintf (Gbl.F.Out,"
"
""
"%s: "
@@ -792,11 +793,11 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
" ",
The_ClassForm[Gbl.Prefs.Theme],
Txt_New_password,
- Pwd_MAX_LENGTH_PLAIN_PASSWORD,
+ Pwd_MAX_CHARS_PLAIN_PASSWORD,
Gbl.Message,
The_ClassForm[Gbl.Prefs.Theme],
Txt_Retype_new_password,
- Pwd_MAX_LENGTH_PLAIN_PASSWORD,
+ Pwd_MAX_CHARS_PLAIN_PASSWORD,
Gbl.Message);
}
@@ -910,7 +911,7 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
Txt_I_understand_that_this_action_can_not_be_undone,
The_ClassForm[Gbl.Prefs.Theme],
Txt_For_security_enter_your_password,
- Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+ Pwd_MAX_CHARS_PLAIN_PASSWORD);
}
/*****************************************************************************/
@@ -922,7 +923,7 @@ bool Pwd_GetConfirmationOnDangerousAction (void)
{
extern const char *Txt_You_have_not_confirmed_the_action;
extern const char *Txt_You_have_not_entered_your_password_correctly;
- char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
+ char PlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1];
char EncryptedPassword[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
/***** Get if consent has been done *****/
@@ -934,7 +935,7 @@ bool Pwd_GetConfirmationOnDangerousAction (void)
/***** Get my password *****/
/* Get plain password from form */
- Par_GetParToText ("OthUsrPwd",PlainPassword,Pwd_MAX_LENGTH_PLAIN_PASSWORD);
+ Par_GetParToText ("OthUsrPwd",PlainPassword,Pwd_MAX_BYTES_PLAIN_PASSWORD);
/* Encrypt password */
Cry_EncryptSHA512Base64 (PlainPassword,EncryptedPassword);
diff --git a/swad_password.h b/swad_password.h
index bf514269..3d0073b0 100644
--- a/swad_password.h
+++ b/swad_password.h
@@ -31,8 +31,11 @@
/************************* Public types and constants ************************/
/*****************************************************************************/
-#define Pwd_MIN_LENGTH_PLAIN_PASSWORD 8
-#define Pwd_MAX_LENGTH_PLAIN_PASSWORD 256
+#define Pwd_MIN_CHARS_PLAIN_PASSWORD 8
+#define Pwd_MIN_BYTES_PLAIN_PASSWORD Pwd_MIN_CHARS_PLAIN_PASSWORD
+
+#define Pwd_MAX_CHARS_PLAIN_PASSWORD (256 - 1)
+#define Pwd_MAX_BYTES_PLAIN_PASSWORD Pwd_MAX_CHARS_PLAIN_PASSWORD
/*****************************************************************************/
/***************************** Public prototypes *****************************/
@@ -50,8 +53,8 @@ void Pwd_ActChgMyPwd2 (void);
void Pwd_PutLinkToSendNewPasswd (void);
void Pwd_ShowFormSendNewPwd (void);
void Pwd_ChkIdLoginAndSendNewPwd (void);
-int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1]);
-void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1]);
+int Pwd_SendNewPasswordByEmail (char NewRandomPlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1]);
+void Pwd_SetMyPendingPassword (char PlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1]);
void Pwd_UpdateOtherPwd1 (void);
void Pwd_UpdateOtherPwd2 (void);
diff --git a/swad_photo.c b/swad_photo.c
index 3445cda7..3291f6f3 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1099,7 +1099,7 @@ void Pho_UpdatePhotoName (struct UsrData *UsrDat)
/***** Update photo name in user's data *****/
Str_Copy (UsrDat->Photo,Gbl.UniqueNameEncrypted,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
}
/*****************************************************************************/
@@ -1116,7 +1116,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW; // Only in main window
bool PutZoomCode = Zoom == Pho_ZOOM && // Make zoom
Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW; // Only in main window
- char IdCaption[Act_MAX_LENGTH_ID];
+ char IdCaption[Act_MAX_BYTES_ID];
/***** Start form to go to public profile *****/
if (PutLinkToPublicProfile)
@@ -2325,7 +2325,7 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,
char PhotoURL[PATH_MAX + 1];
char PhotoCaption[512];
bool ShowDegPhoto;
- char IdCaption[Act_MAX_LENGTH_ID];
+ char IdCaption[Act_MAX_BYTES_ID];
/***** Initializations *****/
PhotoURL[0] = '\0';
diff --git a/swad_plugin.c b/swad_plugin.c
index c08a68cc..ba911cb9 100644
--- a/swad_plugin.c
+++ b/swad_plugin.c
@@ -79,7 +79,7 @@ void Plg_ListPlugins (void)
extern const char *Txt_Plugin;
unsigned NumPlg;
struct Plugin *Plg;
- char URL[Cns_MAX_LENGTH_WWW+Ses_LENGTH_SESSION_ID + 1];
+ char URL[Cns_MAX_BYTES_WWW + Ses_LENGTH_SESSION_ID + 1];
if (Gbl.Usrs.Me.LoggedRole != Rol_SYS_ADM)
{
@@ -244,7 +244,7 @@ static void Plg_GetListPlugins (void)
/* Get the URL of the plugin (row[5]) */
Str_Copy (Plg->URL,row[5],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
/* Get the IP of the plugin (row[6]) */
Str_Copy (Plg->IP,row[6],
@@ -311,7 +311,7 @@ bool Plg_GetDataOfPluginByCod (struct Plugin *Plg)
/* Get the URL of the plugin (row[4]) */
Str_Copy (Plg->URL,row[4],
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
/* Get the IP of the plugin (row[5]) */
Str_Copy (Plg->IP,row[5],
@@ -441,7 +441,7 @@ static void Plg_ListPluginsForEdition (void)
fprintf (Gbl.F.Out,"
",
- Cns_MAX_LENGTH_WWW,Plg->URL,Gbl.Form.Id);
+ Cns_MAX_CHARS_WWW,Plg->URL,Gbl.Form.Id);
Act_FormEnd ();
fprintf (Gbl.F.Out,"");
@@ -741,8 +741,8 @@ void Plg_ChangePlgURL (void)
extern const char *Txt_The_new_URL_is_X;
extern const char *Txt_You_can_not_leave_the_URL_empty;
struct Plugin *Plg;
- char Query[256 + Cns_MAX_LENGTH_WWW];
- char NewURL[Cns_MAX_LENGTH_WWW + 1];
+ char Query[256 + Cns_MAX_BYTES_WWW];
+ char NewURL[Cns_MAX_BYTES_WWW + 1];
Plg = &Gbl.Plugins.EditingPlg;
@@ -752,7 +752,7 @@ void Plg_ChangePlgURL (void)
Lay_ShowErrorAndExit ("Code of plugin is missing.");
/* Get the new URL for the plugin */
- Par_GetParToText ("URL",NewURL,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("URL",NewURL,Cns_MAX_BYTES_WWW);
/***** Check if new URL is empty *****/
if (NewURL[0])
@@ -772,7 +772,7 @@ void Plg_ChangePlgURL (void)
/***** Show the form again *****/
Str_Copy (Plg->URL,NewURL,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
Plg_EditPlugins ();
}
@@ -910,7 +910,7 @@ static void Plg_PutFormToCreatePlugin (void)
" size=\"15\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />"
"",
- Cns_MAX_LENGTH_WWW,Plg->URL);
+ Cns_MAX_CHARS_WWW,Plg->URL);
/***** Plugin IP address *****/
fprintf (Gbl.F.Out,"
"
@@ -1003,7 +1003,7 @@ void Plg_RecFormNewPlg (void)
Par_GetParToText ("AppKey",Plg->AppKey,Plg_MAX_LENGTH_PLUGIN_APP_KEY);
/* Get plugin URL */
- Par_GetParToText ("URL",Plg->URL,Cns_MAX_LENGTH_WWW);
+ Par_GetParToText ("URL",Plg->URL,Cns_MAX_BYTES_WWW);
/* Get plugin IP address */
Par_GetParToText ("IP",Plg->IP,Cns_MAX_LENGTH_IP);
@@ -1043,7 +1043,7 @@ static void Plg_CreatePlugin (struct Plugin *Plg)
Plg_MAX_LENGTH_PLUGIN_DESCRIPTION +
Plg_MAX_LENGTH_PLUGIN_LOGO +
Plg_MAX_LENGTH_PLUGIN_APP_KEY +
- Cns_MAX_LENGTH_WWW +
+ Cns_MAX_BYTES_WWW +
Cns_MAX_LENGTH_IP];
/***** Create a new plugin *****/
diff --git a/swad_plugin.h b/swad_plugin.h
index bc80dea3..23e35a9e 100644
--- a/swad_plugin.h
+++ b/swad_plugin.h
@@ -47,7 +47,7 @@ struct Plugin
char Description[Plg_MAX_LENGTH_PLUGIN_DESCRIPTION + 1];
char Logo[Plg_MAX_LENGTH_PLUGIN_LOGO + 1];
char AppKey[Plg_MAX_LENGTH_PLUGIN_APP_KEY + 1];
- char URL[Cns_MAX_LENGTH_WWW + 1];
+ char URL[Cns_MAX_BYTES_WWW + 1];
char IP[Cns_MAX_LENGTH_IP + 1];
};
diff --git a/swad_profile.c b/swad_profile.c
index 246b4171..c2bea201 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -404,7 +404,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
unsigned NumCrssUsrIsStudent;
unsigned NumFiles;
unsigned NumPublicFiles;
- char IdFirstClickTime[Act_MAX_LENGTH_ID];
+ char IdFirstClickTime[Act_MAX_BYTES_ID];
/***** Start left list *****/
fprintf (Gbl.F.Out,""
diff --git a/swad_record.c b/swad_record.c
index 6f992b86..8267fc01 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -995,7 +995,7 @@ void Rec_ListRecordsGsts (void)
Ptr = Gbl.Usrs.Select.All;
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat);
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get from the database the data of the student
{
@@ -1158,7 +1158,7 @@ static void Rec_ListRecordsStds (Rec_SharedRecordViewType_t ShaTypeOfView,
Ptr = Gbl.Usrs.Select.All;
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat);
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get from the database the data of the student
if (Usr_CheckIfUsrBelongsToCrs (UsrDat.UsrCod,
@@ -1354,7 +1354,7 @@ void Rec_ListRecordsTchs (void)
Ptr = Gbl.Usrs.Select.All;
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat);
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get from the database the data of the student
if (Usr_CheckIfUsrBelongsToCrs (UsrDat.UsrCod,
diff --git a/swad_report.c b/swad_report.c
index 6309e6d8..136ec8b8 100644
--- a/swad_report.c
+++ b/swad_report.c
@@ -766,7 +766,7 @@ static void Rep_WriteSectionHitsPerAction (struct Rep_Report *Report)
Act_Action_t Action;
Act_Action_t SuperAction;
Tab_Tab_t Tab;
- char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
+ char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
unsigned long NumClicks;
/***** Start of section *****/
diff --git a/swad_session.h b/swad_session.h
index bc95806e..17680c3b 100644
--- a/swad_session.h
+++ b/swad_session.h
@@ -33,7 +33,7 @@
/***************************** Public constants ******************************/
/*****************************************************************************/
-#define Ses_LENGTH_SESSION_ID Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64
+#define Ses_LENGTH_SESSION_ID Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64
#define Con_MIN_TIME_TO_REFRESH_CONNECTED_IN_MS (Cfg_MIN_TIME_TO_REFRESH_CONNECTED * 1000L) // Refresh period of connected users in miliseconds
#define Con_MAX_TIME_TO_REFRESH_CONNECTED_IN_MS (Cfg_MAX_TIME_TO_REFRESH_CONNECTED * 1000L) // Refresh period of connected users in miliseconds
diff --git a/swad_social.c b/swad_social.c
index cf0e363e..97869856 100644
--- a/swad_social.c
+++ b/swad_social.c
@@ -182,10 +182,10 @@ static void Soc_PutTextarea (const char *Placeholder,
static long Soc_ReceiveSocialPost (void);
-static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Act_MAX_LENGTH_ID]);
+static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Act_MAX_BYTES_ID]);
static void Soc_PutIconCommentDisabled (void);
static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod,
- const char IdNewComment[Act_MAX_LENGTH_ID]);
+ const char IdNewComment[Act_MAX_BYTES_ID]);
static unsigned long Soc_GetNumCommentsInSocialNote (long NotCod);
static void Soc_WriteCommentsInSocialNote (const struct SocialNote *SocNot);
static void Soc_WriteSocialComment (struct SocialComment *SocCom,
@@ -1265,7 +1265,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
char ForumName[For_MAX_BYTES_FORUM_NAME + 1];
char SummaryStr[Cns_MAX_BYTES_SUMMARY_STRING + 1];
unsigned NumComments;
- char IdNewComment[Act_MAX_LENGTH_ID];
+ char IdNewComment[Act_MAX_BYTES_ID];
/***** Start frame ****/
if (ShowNoteAlone)
@@ -1617,7 +1617,7 @@ static void Soc_WriteAuthorNote (const struct UsrData *UsrDat)
static void Soc_WriteDateTime (time_t TimeUTC)
{
extern const char *Txt_Today;
- char IdDateTime[Act_MAX_LENGTH_ID];
+ char IdDateTime[Act_MAX_BYTES_ID];
/***** Create unique Id *****/
Act_SetUniqueId (IdDateTime);
@@ -2190,7 +2190,7 @@ static void Soc_PutTextarea (const char *Placeholder,
const char *ClassTextArea,const char *ClassImgTit)
{
extern const char *Txt_Post;
- char IdDivImgButton[Act_MAX_LENGTH_ID];
+ char IdDivImgButton[Act_MAX_BYTES_ID];
/***** Set unique id for the hidden div *****/
Act_SetUniqueId (IdDivImgButton);
@@ -2292,7 +2292,7 @@ static long Soc_ReceiveSocialPost (void)
/***** Allocate space for query *****/
if ((Query = malloc (256 +
strlen (Content) +
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@@ -2336,7 +2336,7 @@ static long Soc_ReceiveSocialPost (void)
/****** Put an icon to toggle on/off the form to comment a social note *******/
/*****************************************************************************/
-static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Act_MAX_LENGTH_ID])
+static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Act_MAX_BYTES_ID])
{
extern const char *Txt_Comment;
@@ -2378,7 +2378,7 @@ static void Soc_PutIconCommentDisabled (void)
// All forms in this function and nested functions must have unique identifiers
static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod,
- const char IdNewComment[Act_MAX_LENGTH_ID])
+ const char IdNewComment[Act_MAX_BYTES_ID])
{
extern const char *Txt_New_SOCIAL_comment;
bool ShowPhoto = false;
@@ -2992,7 +2992,7 @@ static long Soc_ReceiveComment (void)
/***** Allocate space for query *****/
if ((Query = malloc (256 +
strlen (Content) +
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@@ -4910,9 +4910,9 @@ static void Str_AnalyzeTxtAndStoreNotifyEventToMentionedUsrs (long PubCod,const
Nickname.Length = (size_t) (Ptr - Nickname.PtrStart);
/* A nick (without arroba) must have a number of characters
- Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA <= Length <= Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA */
- IsNickname = (Nickname.Length >= Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA &&
- Nickname.Length <= Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MIN_BYTES_NICKNAME_WITHOUT_ARROBA <= Length <= Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA */
+ IsNickname = (Nickname.Length >= Nck_MIN_BYTES_NICKNAME_WITHOUT_ARROBA &&
+ Nickname.Length <= Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
if (IsNickname)
{
diff --git a/swad_statistic.c b/swad_statistic.c
index 48261f9e..a7051454 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -774,7 +774,7 @@ static void Sta_WriteSelectorAction (void)
Act_Action_t Action;
Act_Action_t SuperAction;
Tab_Tab_t Tab;
- char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
+ char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
fprintf (Gbl.F.Out,"
"
""
@@ -836,7 +836,7 @@ void Sta_SeeCrsAccesses (void)
/******************** Compute and show access statistics ********************/
/*****************************************************************************/
-#define Sta_MAX_LENGTH_QUERY_ACCESS (1024 + (10 + ID_MAX_LENGTH_USR_ID) * 5000 - 1)
+#define Sta_MAX_LENGTH_QUERY_ACCESS (1024 + (10 + ID_MAX_BYTES_USR_ID) * 5000 - 1)
#define Sta_MAX_LENGTH_COUNT_TYPE (256 - 1)
@@ -1289,7 +1289,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
Ptr = Gbl.Usrs.Select.All;
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat);
if (UsrDat.UsrCod > 0)
{
@@ -1570,7 +1570,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
Rol_Role_t RoleFromLog;
unsigned UniqueId;
long ActCod;
- char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
+ char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
/***** Initialize estructura of data of the user *****/
Usr_UsrDataConstructor (&UsrDat);
@@ -3053,7 +3053,7 @@ static void Sta_ShowNumHitsPerAction (unsigned long NumRows,
struct Sta_Hits Hits;
MYSQL_ROW row;
long ActCod;
- char ActTxt[Act_MAX_LENGTH_ACTION_TXT + 1];
+ char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
/***** Write heading *****/
fprintf (Gbl.F.Out," "
diff --git a/swad_string.c b/swad_string.c
index 8952cbb2..d818874a 100644
--- a/swad_string.c
+++ b/swad_string.c
@@ -114,7 +114,7 @@ void Str_InsertLinks (char *Txt,unsigned long MaxLength,size_t MaxCharsURLOnScre
extern const char *Txt_STR_LANG_ID[1 + Txt_NUM_LANGUAGES];
char ParamsStr[256 + 256 + Ses_LENGTH_SESSION_ID + 256];
char Anchor1Nick[256 + 256 + 256 + Ses_LENGTH_SESSION_ID + 256 + 256];
- char Anchor2Nick[256 + Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64];
+ char Anchor2Nick[256 + Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64];
size_t TxtLength;
size_t TxtLengthWithInsertedAnchors;
@@ -286,10 +286,10 @@ void Str_InsertLinks (char *Txt,unsigned long MaxLength,size_t MaxCharsURLOnScre
Links[NumLinks].NumActualBytes = (size_t) (PtrSrc - Links[NumLinks].PtrStart);
/* A nick (without arroba) must have a number of characters
- Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA <= Length <= Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA */
+ Nck_MIN_BYTES_NICKNAME_WITHOUT_ARROBA <= Length <= Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA */
Length = Links[NumLinks].NumActualBytes - 1; // Do not count the initial @
- IsNickname = (Length >= Nck_MIN_LENGTH_NICKNAME_WITHOUT_ARROBA &&
- Length <= Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ IsNickname = (Length >= Nck_MIN_BYTES_NICKNAME_WITHOUT_ARROBA &&
+ Length <= Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
if (IsNickname)
{
@@ -2263,38 +2263,6 @@ void Str_GetNextStringUntilSeparator (const char **StrSrc,char *StrDst,size_t Ma
StrDst[i] = '\0';
}
-/*****************************************************************************/
-/********** Get from file FileSrc the next string until separator ************/
-/*****************************************************************************/
-
-void Str_GetNextStringFromFileUntilSeparator (FILE *FileSrc,char *StrDst)
- {
- int i = 0;
- int Ch;
-
- /***** Skip separators *****/
- do
- Ch = fgetc (FileSrc);
- while (Ch != EOF &&
- (isspace (Ch) ||
- Ch == 0xA0 || // Unicode translation for
- Ch == (int) ',' ||
- Ch == (int) ';')); // Skip spaces, puntuación, etc.
-
- /***** Copy string while no separator found *****/
- while (Ch != EOF &&
- !(isspace (Ch) ||
- Ch == 0xA0 || // Unicode translation for
- Ch == (int) ',' ||
- Ch == (int) ';'))
- {
- if (i < ID_MAX_LENGTH_USR_ID)
- StrDst[i++] = (char) Ch;
- Ch = fgetc (FileSrc);
- }
- StrDst[i] = '\0';
- }
-
/*****************************************************************************/
/********** Get from StrSrc into StrDst the next string until comma **********/
/*****************************************************************************/
diff --git a/swad_string.h b/swad_string.h
index c632143d..6706f659 100644
--- a/swad_string.h
+++ b/swad_string.h
@@ -36,8 +36,8 @@
/*****************************************************************************/
#define Str_LENGTH_STR_HEX 3 // Length of the string #XX
-#define Str_MAX_LENGTH_SPEC_CHAR_HTML 6 // Length of the string DDD;
-#define Str_MAX_CHARACTER 6 // max (Str_LENGTH_STR_HEX,Str_MAX_LENGTH_SPEC_CHAR_HTML)
+#define Str_MAX_LENGTH_SPEC_CHAR_HTML 8 // Length of the string DDDDD;
+#define Str_MAX_BYTES_PER_CHAR 8 // max (Str_LENGTH_STR_HEX,Str_MAX_LENGTH_SPEC_CHAR_HTML)
/*****************************************************************************/
/******************************* Public types *******************************/
@@ -97,7 +97,6 @@ char *Str_GetCellFromHTMLTableSkipComments (FILE *FileSrc,char *Str,int MaxLengt
char *Str_GetNextStrFromFileConvertingToLower (FILE *FileSrc,char *Str, int N);
void Str_GetNextStringUntilSpace (const char **StrSrc,char *StrDst,size_t MaxLength);
void Str_GetNextStringUntilSeparator (const char **StrSrc,char *StrDst,size_t MaxLength);
-void Str_GetNextStringFromFileUntilSeparator (FILE *FileSrc,char *StrDst);
void Str_GetNextStringUntilComma (const char **StrSrc,char *StrDst,size_t MaxLength);
void Str_ReplaceSeveralSpacesForOne (char *Str);
void Str_CopyStrChangingSpaces (const char *StringWithSpaces,char *StringWithoutSpaces,unsigned MaxLength);
diff --git a/swad_survey.c b/swad_survey.c
index 92f9a1ae..f981678b 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -50,7 +50,7 @@ extern struct Globals Gbl;
/*****************************************************************************/
#define Svy_MAX_LENGTH_ANSWER 1000
-#define Svy_MAX_BYTES_ANSWER (Svy_MAX_LENGTH_ANSWER * Str_MAX_CHARACTER)
+#define Svy_MAX_BYTES_ANSWER (Svy_MAX_LENGTH_ANSWER * Str_MAX_BYTES_PER_CHAR)
#define Svy_MAX_BYTES_LIST_ANSWER_TYPES (10 + (Svy_NUM_ANS_TYPES - 1) * (1 + 10))
const char *Svy_StrAnswerTypesDB[Svy_NUM_ANS_TYPES] =
diff --git a/swad_syllabus.c b/swad_syllabus.c
index ea63c293..97018583 100644
--- a/swad_syllabus.c
+++ b/swad_syllabus.c
@@ -56,7 +56,7 @@ extern struct Globals Gbl;
#define Syl_MAX_LENGTH_ITEM_COD (Syl_MAX_LEVELS_SYLLABUS * (10 + 1) - 1)
#define Syl_MAX_LENGTH_TEXT_ITEM 1024
-#define Syl_MAX_BYTES_TEXT_ITEM (Syl_MAX_LENGTH_TEXT_ITEM*Str_MAX_CHARACTER)
+#define Syl_MAX_BYTES_TEXT_ITEM (Syl_MAX_LENGTH_TEXT_ITEM*Str_MAX_BYTES_PER_CHAR)
#define Syl_WIDTH_NUM_SYLLABUS 20
diff --git a/swad_test.c b/swad_test.c
index 4134f045..83ed0a92 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -6009,7 +6009,7 @@ static void Tst_InsertOrUpdateQstIntoDB (void)
if ((Query = malloc (512 +
Gbl.Test.Stem.Length +
Gbl.Test.Feedback.Length +
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 +
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 +
Img_MAX_BYTES_TITLE)) == NULL)
Lay_ShowErrorAndExit ("Not enough memory to store database query.");
@@ -7070,7 +7070,7 @@ void Tst_ShowUsrsTestResults (void)
Ptr = Gbl.Usrs.Select.All;
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&Gbl.Usrs.Other.UsrDat);
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat)) // Get of the database the data of the user
if (Usr_CheckIfUsrBelongsToCrs (Gbl.Usrs.Other.UsrDat.UsrCod,
diff --git a/swad_test.h b/swad_test.h
index 034b3e99..b156ed58 100644
--- a/swad_test.h
+++ b/swad_test.h
@@ -36,13 +36,13 @@
#define Tst_MAX_QUESTIONS_PER_TEST 100 // Absolute maximum number of questions in a test
#define Tst_MAX_TAGS_PER_QUESTION 5
#define Tst_MAX_LENGTH_TAG (256 -1)
-#define Tst_MAX_BYTES_TAG (Tst_MAX_LENGTH_TAG*Str_MAX_CHARACTER)
+#define Tst_MAX_BYTES_TAG (Tst_MAX_LENGTH_TAG*Str_MAX_BYTES_PER_CHAR)
#define Tst_MAX_OPTIONS_PER_QUESTION 10
#define Tst_MAX_SIZE_INDEXES_ONE_QST (Tst_MAX_OPTIONS_PER_QUESTION * (10 + 1))
#define Tst_MAX_SIZE_ANSWERS_ONE_QST (Tst_MAX_OPTIONS_PER_QUESTION * (10 + 1))
#define Tst_MAX_LENGTH_ANSWER 1000
-#define Tst_MAX_BYTES_ANSWER_OR_FEEDBACK (Tst_MAX_LENGTH_ANSWER*Str_MAX_CHARACTER)
+#define Tst_MAX_BYTES_ANSWER_OR_FEEDBACK (Tst_MAX_LENGTH_ANSWER*Str_MAX_BYTES_PER_CHAR)
#define Tst_CONFIG_DEFAULT_MIN_QUESTIONS 1
#define Tst_CONFIG_DEFAULT_DEF_QUESTIONS 20 // Number of questions to be generated by default in a self-assessment test
diff --git a/swad_user.c b/swad_user.c
index d22353cf..fef2443b 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -434,7 +434,7 @@ void Usr_GetEncryptedUsrCodFromUsrCod (struct UsrData *UsrDat) // TODO: Remove t
/***** Get encrypted user's code *****/
row = mysql_fetch_row (mysql_res);
Str_Copy (UsrDat->EncryptedUsrCod,row[0],
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
/***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res);
@@ -483,7 +483,7 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat)
/* Get encrypted user's code */
Str_Copy (UsrDat->EncryptedUsrCod,row[0],
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
/* Get encrypted password */
Str_Copy (UsrDat->Password,row[1],
@@ -550,7 +550,7 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat)
/* Get rest of data */
Str_Copy (UsrDat->Photo,row[10],
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
UsrDat->PhotoVisibility = Pri_GetVisibilityFromStr (row[11]);
UsrDat->ProfileVisibility = Pri_GetVisibilityFromStr (row[12]);
UsrDat->CtyCod = Str_ConvertStrCodToLongCod (row[13]);
@@ -2070,7 +2070,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
Gbl.Prefs.IconsURL,
Txt_Password,
Txt_Password,
- Pwd_MAX_LENGTH_PLAIN_PASSWORD,
+ Pwd_MAX_CHARS_PLAIN_PASSWORD,
Txt_password);
/***** Send button and end table and frame *****/
@@ -2374,7 +2374,7 @@ unsigned Usr_GetParamOtherUsrIDNickOrEMailAndGetUsrCods (struct ListUsrCods *Lis
Str_Copy (Gbl.Usrs.Other.UsrDat.IDs.List[0].ID,
Gbl.Usrs.Other.UsrDat.UsrIDNickOrEmail,
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
Str_ConvertToUpperText (Gbl.Usrs.Other.UsrDat.IDs.List[0].ID);
/* Check if user's ID exists in database */
@@ -2412,7 +2412,7 @@ void Usr_PutParamOtherUsrCodEncrypted (void)
Usr_PutParamUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
}
-void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1])
+void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1])
{
Par_PutHiddenParamString ("OtherUsrCod",EncryptedUsrCod);
}
@@ -2424,7 +2424,7 @@ void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTE
void Usr_GetParamOtherUsrCodEncrypted (struct UsrData *UsrDat)
{
Par_GetParToText ("OtherUsrCod",UsrDat->EncryptedUsrCod,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
if (UsrDat->EncryptedUsrCod[0]) // If parameter exists...
{
Usr_GetUsrCodFromEncryptedUsrCod (UsrDat);
@@ -2681,7 +2681,7 @@ static bool Usr_ChkUsrAndGetUsrDataFromDirectLogin (void)
ID_ReallocateListIDs (&Gbl.Usrs.Me.UsrDat,1);
Str_Copy (Gbl.Usrs.Me.UsrDat.IDs.List[0].ID,Gbl.Usrs.Me.UsrIdLogin,
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
Str_ConvertToUpperText (Gbl.Usrs.Me.UsrDat.IDs.List[0].ID);
/* Check if user's ID exists in database, and get user's data */
@@ -4879,7 +4879,7 @@ static void Usr_GetListUsrsFromQuery (const char *Query,Rol_Role_t Role,Sco_Scop
/* Get encrypted user's code (row[1]) */
Str_Copy (UsrInList->EncryptedUsrCod,row[1],
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
/* Get encrypted password (row[2]) */
Str_Copy (UsrInList->Password,row[2],
@@ -4902,7 +4902,7 @@ static void Usr_GetListUsrsFromQuery (const char *Query,Rol_Role_t Role,Sco_Scop
/* Get user's photo (row[7]) */
Str_Copy (UsrInList->Photo,row[7],
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
/* Get user's photo visibility (row[8]) */
UsrInList->PhotoVisibility = Pri_GetVisibilityFromStr (row[8]);
@@ -5002,7 +5002,7 @@ void Usr_CopyBasicUsrDataFromList (struct UsrData *UsrDat,const struct UsrInList
{
UsrDat->UsrCod = UsrInList->UsrCod;
Str_Copy (UsrDat->EncryptedUsrCod,UsrInList->EncryptedUsrCod,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Str_Copy (UsrDat->Surname1,UsrInList->Surname1,
Usr_MAX_BYTES_NAME);
Str_Copy (UsrDat->Surname2,UsrInList->Surname2,
@@ -5011,7 +5011,7 @@ void Usr_CopyBasicUsrDataFromList (struct UsrData *UsrDat,const struct UsrInList
Usr_MAX_BYTES_NAME);
UsrDat->Sex = UsrInList->Sex;
Str_Copy (UsrDat->Photo,UsrInList->Photo,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
UsrDat->PhotoVisibility = UsrInList->PhotoVisibility;
UsrDat->CtyCod = UsrInList->CtyCod;
UsrDat->InsCod = UsrInList->InsCod;
@@ -5292,7 +5292,7 @@ bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs)
ID_ReallocateListIDs (&UsrDat,1);
Str_Copy (UsrDat.IDs.List[0].ID,UsrIDNickOrEmail,
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
/***** Check if a user exists having this user's ID *****/
if (ID_GetListUsrCodsFromUsrID (&UsrDat,NULL,&ListUsrCods,false))
@@ -5380,14 +5380,14 @@ bool Usr_GetListMsgRecipientsWrittenExplicitelyBySender (bool WriteErrorMsgs)
bool Usr_FindUsrCodInListOfSelectedUsrs (const char *EncryptedUsrCodToFind)
{
const char *Ptr;
- char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1];
+ char EncryptedUsrCod[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1];
if (Gbl.Usrs.Select.All)
{
Ptr = Gbl.Usrs.Select.All;
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
if (!strcmp (EncryptedUsrCodToFind,EncryptedUsrCod))
return true; // Found!
}
@@ -5409,7 +5409,7 @@ unsigned Usr_CountNumUsrsInListOfSelectedUsrs (void)
Ptr = Gbl.Usrs.Select.All;
while (*Ptr)
{
- Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat);
if (UsrDat.UsrCod > 0)
NumUsrs++;
diff --git a/swad_user.h b/swad_user.h
index 2f2c056b..bbc95cdd 100644
--- a/swad_user.h
+++ b/swad_user.h
@@ -77,7 +77,7 @@
#define Usr_LIST_WITH_PHOTOS_DEF false
-#define Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS (Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 * Cfg_MAX_USRS_IN_LIST)
+#define Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS (Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 * Cfg_MAX_USRS_IN_LIST)
#define Usr_NUM_MAIN_FIELDS_DATA_USR 8
@@ -119,14 +119,14 @@ typedef enum
struct UsrData
{
long UsrCod;
- char EncryptedUsrCod [Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1];
+ char EncryptedUsrCod [Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1];
char UsrIDNickOrEmail[Usr_MAX_BYTES_USR_LOGIN + 1]; // String to store the ID, nickname or email
struct
{
struct ListIDs *List;
unsigned Num;
} IDs;
- char Nickname [Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1];
+ char Nickname [Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1];
char Password [Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
Rol_Role_t RoleInCurrentCrsDB;
int Roles; // Check always if filled/calculated
@@ -140,7 +140,7 @@ struct UsrData
Usr_Sex_t Sex;
char Email [Usr_MAX_BYTES_USR_EMAIL + 1];
bool EmailConfirmed;
- char Photo [Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]; // Name of public link to photo
+ char Photo [Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1]; // Name of public link to photo
Pri_Visibility_t PhotoVisibility; // Who can see user's photo
Pri_Visibility_t ProfileVisibility; // Who can see user's public profile
long CtyCod; // Country
@@ -185,13 +185,13 @@ struct UsrLast
struct UsrInList
{
long UsrCod;
- char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1];
+ char EncryptedUsrCod[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1];
char Password[Cry_LENGTH_ENCRYPTED_STR_SHA512_BASE64 + 1];
char Surname1 [Usr_MAX_BYTES_NAME + 1];
char Surname2 [Usr_MAX_BYTES_NAME + 1];
char FirstName[Usr_MAX_BYTES_NAME + 1];
Usr_Sex_t Sex;
- char Photo[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]; // Name of public link to photo
+ char Photo[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1]; // Name of public link to photo
Pri_Visibility_t PhotoVisibility; // Who can see user's photo
long CtyCod; // Country
long InsCod; // Institution
@@ -303,7 +303,7 @@ unsigned Usr_GetParamOtherUsrIDNickOrEMailAndGetUsrCods (struct ListUsrCods *Lis
void Usr_PutParamMyUsrCodEncrypted (void);
void Usr_PutParamOtherUsrCodEncrypted (void);
-void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
+void Usr_PutParamUsrCodEncrypted (const char EncryptedUsrCod[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1]);
void Usr_GetParamOtherUsrCodEncrypted (struct UsrData *UsrDat);
void Usr_GetParamOtherUsrCodEncryptedAndGetListIDs (void);
bool Usr_GetParamOtherUsrCodEncryptedAndGetUsrData (void);
diff --git a/swad_web_service.c b/swad_web_service.c
index acc72792..e76fb2cb 100644
--- a/swad_web_service.c
+++ b/swad_web_service.c
@@ -192,7 +192,7 @@ Svc_Role_t Svc_RolRole_to_SvcRole[Rol_NUM_ROLES] =
Svc_ROLE_UNKNOWN, // Rol_SYS_ADM
};
-#define Svc_LENGTH_WS_KEY Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64
+#define Svc_LENGTH_WS_KEY Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64
/*****************************************************************************/
/********************************* Data types ********************************/
@@ -204,11 +204,11 @@ Svc_Role_t Svc_RolRole_to_SvcRole[Rol_NUM_ROLES] =
static int Svc_GetPlgCodFromAppKey (const char *appKey);
static int Svc_CheckIdSession (const char *IdSession);
-static int Svc_CheckWSKey (char WSKey[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
+static int Svc_CheckWSKey (char WSKey[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1]);
static int Svc_CheckCourseAndGroupCodes (long CrsCod,long GrpCod);
static int Svc_GenerateNewWSKey (long UsrCod,
- char WSKey[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1]);
+ char WSKey[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1]);
static int Svc_RemoveOldWSKeys (void);
static int Svc_GetCurrentDegCodFromCurrentCrsCod (void);
static bool Svc_GetSomeUsrDataFromUsrCod (struct UsrData *UsrDat,long CrsCod);
@@ -371,7 +371,7 @@ static int Svc_CheckIdSession (const char *IdSession)
/************** Check if a web service key exists in database ****************/
/*****************************************************************************/
-static int Svc_CheckWSKey (char WSKey[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1])
+static int Svc_CheckWSKey (char WSKey[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1])
{
char Query[512];
MYSQL_RES *mysql_res;
@@ -443,7 +443,7 @@ static int Svc_CheckCourseAndGroupCodes (long CrsCod,long GrpCod)
/*****************************************************************************/
static int Svc_GenerateNewWSKey (long UsrCod,
- char WSKey[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64 + 1])
+ char WSKey[Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1])
{
int ReturnCode;
char Query[512];
@@ -454,7 +454,7 @@ static int Svc_GenerateNewWSKey (long UsrCod,
/***** Create a unique name for the key *****/
Str_Copy (WSKey,Gbl.UniqueNameEncrypted,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
/***** Check that key does not exist in database *****/
sprintf (Query,"SELECT COUNT(*) FROM ws_keys WHERE WSKey='%s'",
@@ -562,7 +562,7 @@ static bool Svc_GetSomeUsrDataFromUsrCod (struct UsrData *UsrDat,long CrsCod)
/* Get user's photo */
Str_Copy (UsrDat->Photo,row[3],
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
/* Get user's brithday */
Dat_GetDateFromYYYYMMDD (&(UsrDat->Birthday),row[4]);
@@ -688,7 +688,7 @@ int swad__createAccount (struct soap *soap,
/***** Save nickname *****/
Nck_UpdateMyNick (NewNicknameWithoutArroba);
Str_Copy (Gbl.Usrs.Me.UsrDat.Nickname,NewNicknameWithoutArroba,
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
/***** Save email *****/
if (Mai_UpdateEmailInDB (&Gbl.Usrs.Me.UsrDat,userEmail))
@@ -773,7 +773,7 @@ int swad__loginByUserPasswordKey (struct soap *soap,
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumRows;
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
bool UsrFound;
/***** Initializations *****/
@@ -782,12 +782,12 @@ int swad__loginByUserPasswordKey (struct soap *soap,
/***** Allocate space for strings *****/
loginByUserPasswordKeyOut->wsKey = (char *) soap_malloc (Gbl.soap,Svc_LENGTH_WS_KEY + 1);
- loginByUserPasswordKeyOut->userNickname = (char *) soap_malloc (Gbl.soap,Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1);
- loginByUserPasswordKeyOut->userID = (char *) soap_malloc (Gbl.soap,ID_MAX_LENGTH_USR_ID + 1);
+ loginByUserPasswordKeyOut->userNickname = (char *) soap_malloc (Gbl.soap,Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1);
+ loginByUserPasswordKeyOut->userID = (char *) soap_malloc (Gbl.soap,ID_MAX_BYTES_USR_ID + 1);
loginByUserPasswordKeyOut->userFirstname = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_NAME + 1);
loginByUserPasswordKeyOut->userSurname1 = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_NAME + 1);
loginByUserPasswordKeyOut->userSurname2 = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_NAME + 1);
- loginByUserPasswordKeyOut->userPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_LENGTH_WWW + 1);
+ loginByUserPasswordKeyOut->userPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_BYTES_WWW + 1);
loginByUserPasswordKeyOut->userBirthday = (char *) soap_malloc (Gbl.soap,Dat_LENGTH_YYYYMMDD + 1);
/***** Default values returned on error *****/
@@ -879,12 +879,12 @@ int swad__loginByUserPasswordKey (struct soap *soap,
Str_Copy (loginByUserPasswordKeyOut->userNickname,
Gbl.Usrs.Me.UsrDat.Nickname,
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
if (Gbl.Usrs.Me.UsrDat.IDs.Num)
Str_Copy (loginByUserPasswordKeyOut->userID,
Gbl.Usrs.Me.UsrDat.IDs.List[0].ID, // TODO: What user's ID?
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
Str_Copy (loginByUserPasswordKeyOut->userSurname1,
Gbl.Usrs.Me.UsrDat.Surname1,
@@ -898,7 +898,7 @@ int swad__loginByUserPasswordKey (struct soap *soap,
Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL);
Str_Copy (loginByUserPasswordKeyOut->userPhoto,PhotoURL,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
Str_Copy (loginByUserPasswordKeyOut->userBirthday,
Gbl.Usrs.Me.UsrDat.Birthday.YYYYMMDD,
@@ -939,7 +939,7 @@ int swad__loginBySessionKey (struct soap *soap,
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumRows;
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
bool UsrFound;
/***** Initializations *****/
@@ -948,12 +948,12 @@ int swad__loginBySessionKey (struct soap *soap,
/***** Allocate space for strings *****/
loginBySessionKeyOut->wsKey = (char *) soap_malloc (Gbl.soap,Svc_LENGTH_WS_KEY + 1);
- loginBySessionKeyOut->userNickname = (char *) soap_malloc (Gbl.soap,Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1);
- loginBySessionKeyOut->userID = (char *) soap_malloc (Gbl.soap,ID_MAX_LENGTH_USR_ID + 1);
+ loginBySessionKeyOut->userNickname = (char *) soap_malloc (Gbl.soap,Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1);
+ loginBySessionKeyOut->userID = (char *) soap_malloc (Gbl.soap,ID_MAX_BYTES_USR_ID + 1);
loginBySessionKeyOut->userFirstname = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_NAME + 1);
loginBySessionKeyOut->userSurname1 = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_NAME + 1);
loginBySessionKeyOut->userSurname2 = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_NAME + 1);
- loginBySessionKeyOut->userPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_LENGTH_WWW + 1);
+ loginBySessionKeyOut->userPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_BYTES_WWW + 1);
loginBySessionKeyOut->userBirthday = (char *) soap_malloc (Gbl.soap,Dat_LENGTH_YYYYMMDD + 1);
loginBySessionKeyOut->degreeName = (char *) soap_malloc (Gbl.soap,Deg_MAX_LENGTH_DEGREE_FULL_NAME + 1);
loginBySessionKeyOut->courseName = (char *) soap_malloc (Gbl.soap,Crs_MAX_LENGTH_COURSE_FULL_NAME + 1);
@@ -1032,12 +1032,12 @@ int swad__loginBySessionKey (struct soap *soap,
loginBySessionKeyOut->userCode = (int) Gbl.Usrs.Me.UsrDat.UsrCod;
Str_Copy (loginBySessionKeyOut->userNickname,Gbl.Usrs.Me.UsrDat.Nickname,
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
if (Gbl.Usrs.Me.UsrDat.IDs.Num)
Str_Copy (loginBySessionKeyOut->userID,
Gbl.Usrs.Me.UsrDat.IDs.List[0].ID, // TODO: What user's ID?
- ID_MAX_LENGTH_USR_ID);
+ ID_MAX_BYTES_USR_ID);
Str_Copy (loginBySessionKeyOut->userSurname1,
Gbl.Usrs.Me.UsrDat.Surname1,
@@ -1051,7 +1051,7 @@ int swad__loginBySessionKey (struct soap *soap,
Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL);
Str_Copy (loginBySessionKeyOut->userPhoto,PhotoURL,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
Str_Copy (loginBySessionKeyOut->userBirthday,
Gbl.Usrs.Me.UsrDat.Birthday.YYYYMMDD,
@@ -1083,7 +1083,7 @@ int swad__getNewPassword (struct soap *soap,
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumRows;
- char NewRandomPlainPassword[Pwd_MAX_LENGTH_PLAIN_PASSWORD + 1];
+ char NewRandomPlainPassword[Pwd_MAX_BYTES_PLAIN_PASSWORD + 1];
/***** Initializations *****/
Gbl.soap = soap;
@@ -1360,7 +1360,7 @@ int swad__getCourseInfo (struct soap *soap,
Result = Inf_WritePageIntoHTMLBuffer (&(getCourseInfo->infoTxt));
break;
case Inf_INFO_SRC_URL: // Link to a web page
- getCourseInfo->infoTxt = (char *) soap_malloc (Gbl.soap,Cns_MAX_LENGTH_WWW + 1);
+ getCourseInfo->infoTxt = (char *) soap_malloc (Gbl.soap,Cns_MAX_BYTES_WWW + 1);
Inf_WriteURLIntoTxtBuffer (getCourseInfo->infoTxt);
break;
}
@@ -2005,7 +2005,7 @@ int swad__sendMyGroups (struct soap *soap,
static void Svc_CopyUsrData (struct swad__user *Usr,struct UsrData *UsrDat,bool UsrIDIsVisible)
{
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
const char *FirstID;
size_t Length;
@@ -2068,7 +2068,7 @@ int swad__getAttendanceEvents (struct soap *soap,
MYSQL_ROW row;
int NumAttEvent;
long AttCod;
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
long StartTime;
long EndTime;
size_t Length;
@@ -2353,7 +2353,7 @@ int swad__sendAttendanceEvent (struct soap *soap,
"Request forbidden",
"Title of attendance event is empty");
Str_Copy (Att.Title,title,
- Att_MAX_LENGTH_ATTENDANCE_EVENT_TITLE);
+ Att_MAX_BYTES_ATTENDANCE_EVENT_TITLE);
/* Create a list of groups selected */
Svc_GetLstGrpsSel (groups);
@@ -2493,7 +2493,7 @@ int swad__getAttendanceUsers (struct soap *soap,
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumRow,NumRows;
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
size_t Length;
/***** Initializations *****/
@@ -2808,7 +2808,7 @@ int swad__getNotifications (struct soap *soap,
long NtfCod;
Ntf_NotifyEvent_t NotifyEvent;
long EventTime;
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
struct Instit Ins;
struct Centre Ctr;
struct Degree Deg;
@@ -2891,10 +2891,10 @@ int swad__getNotifications (struct soap *soap,
if (Svc_GetSomeUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat,Crs.CrsCod)) // Get some user's data from database
{
- getNotificationsOut->notificationsArray.__ptr[NumNotif].userNickname = (char *) soap_malloc (Gbl.soap,Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 1);
+ getNotificationsOut->notificationsArray.__ptr[NumNotif].userNickname = (char *) soap_malloc (Gbl.soap,Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 1);
Str_Copy (getNotificationsOut->notificationsArray.__ptr[NumNotif].userNickname,
Gbl.Usrs.Other.UsrDat.Nickname,
- Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA);
+ Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA);
getNotificationsOut->notificationsArray.__ptr[NumNotif].userSurname1 = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_NAME + 1);
Str_Copy (getNotificationsOut->notificationsArray.__ptr[NumNotif].userSurname1,
@@ -2912,10 +2912,10 @@ int swad__getNotifications (struct soap *soap,
Usr_MAX_BYTES_NAME);
Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL);
- getNotificationsOut->notificationsArray.__ptr[NumNotif].userPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_LENGTH_WWW + 1);
+ getNotificationsOut->notificationsArray.__ptr[NumNotif].userPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_BYTES_WWW + 1);
Str_Copy (getNotificationsOut->notificationsArray.__ptr[NumNotif].userPhoto,
PhotoURL,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
}
else
{
@@ -3248,7 +3248,7 @@ int swad__sendMessage (struct soap *soap,
Str_RemoveLeadingArrobas (Nickname);
/* Check for overflow in query */
- if (strlen (Query) + Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA + 32 >
+ if (strlen (Query) + Nck_MAX_BYTES_NICKNAME_WITHOUT_ARROBA + 32 >
Svc_MAX_LENGTH_QUERY_RECIPIENTS)
return soap_sender_fault (Gbl.soap,
"Can not send message",
@@ -4449,7 +4449,7 @@ static bool Svc_WriteRowFileBrowser (unsigned Level,Brw_FileType_t FileType,cons
extern const char *Txt_NEW_LINE;
extern const char *Txt_LICENSES[Brw_NUM_LICENSES];
struct FileMetadata FileMetadata;
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
/***** Is this row hidden or visible? *****/
if (Gbl.FileBrowser.Type == Brw_SHOW_DOCUM_CRS ||
@@ -4525,8 +4525,8 @@ int swad__getFile (struct soap *soap,
extern const char *Txt_LICENSES[Brw_NUM_LICENSES];
int ReturnCode;
struct FileMetadata FileMetadata;
- char URL[Cns_MAX_LENGTH_WWW + 1];
- char PhotoURL[Cns_MAX_LENGTH_WWW + 1];
+ char URL[Cns_MAX_BYTES_WWW + 1];
+ char PhotoURL[Cns_MAX_BYTES_WWW + 1];
/***** Initializations *****/
Gbl.soap = soap;
@@ -4534,10 +4534,10 @@ int swad__getFile (struct soap *soap,
/***** Allocate space for strings *****/
getFileOut->fileName = (char *) soap_malloc (Gbl.soap,NAME_MAX + 1);
- getFileOut->URL = (char *) soap_malloc (Gbl.soap,Cns_MAX_LENGTH_WWW + 1);
+ getFileOut->URL = (char *) soap_malloc (Gbl.soap,Cns_MAX_BYTES_WWW + 1);
getFileOut->license = (char *) soap_malloc (Gbl.soap,Brw_MAX_LENGTH_LICENSE + 1);
getFileOut->publisherName = (char *) soap_malloc (Gbl.soap,Usr_MAX_BYTES_FULL_NAME + 1);
- getFileOut->publisherPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_LENGTH_WWW + 1);
+ getFileOut->publisherPhoto = (char *) soap_malloc (Gbl.soap,Cns_MAX_BYTES_WWW + 1);
/***** Default values returned on error *****/
getFileOut->fileName[0] = '\0';
@@ -4647,7 +4647,7 @@ int swad__getFile (struct soap *soap,
NAME_MAX);
Str_Copy (getFileOut->URL,URL,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
getFileOut->size = (int) FileMetadata.Size;
@@ -4666,7 +4666,7 @@ int swad__getFile (struct soap *soap,
Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL);
Str_Copy (getFileOut->publisherPhoto,PhotoURL,
- Cns_MAX_LENGTH_WWW);
+ Cns_MAX_BYTES_WWW);
}
return SOAP_OK;
diff --git a/swad_zip.c b/swad_zip.c
index 306b9487..10f2c040 100644
--- a/swad_zip.c
+++ b/swad_zip.c
@@ -178,7 +178,7 @@ void ZIP_CreateZIPAsgWrk (void)
while (*Ptr)
{
Par_GetNextStrUntilSeparParamMult (&Ptr,UsrDat.EncryptedUsrCod,
- Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64);
+ Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
Usr_GetUsrCodFromEncryptedUsrCod (&UsrDat);