Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.67.1

This commit is contained in:
Antonio Cañas Vargas 2019-11-14 08:59:11 +01:00
parent 8298f13fb6
commit fa87093776
24 changed files with 96 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
swad_HTML.c
View File

@ -123,10 +123,7 @@ void HTM_TABLE_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Class,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -250,10 +247,7 @@ void HTM_TR_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -350,10 +344,7 @@ static void HTM_TH_BeginAttr (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -415,10 +406,7 @@ void HTM_TD_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -493,10 +481,7 @@ void HTM_DIV_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -587,10 +572,7 @@ void HTM_SPAN_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -656,10 +638,7 @@ void HTM_UL_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -708,10 +687,7 @@ void HTM_LI_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -815,10 +791,7 @@ void HTM_A_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -895,10 +868,7 @@ void HTM_PARAM (const char *Name,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Value,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -925,10 +895,7 @@ void HTM_LABEL_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -982,10 +949,7 @@ void HTM_INPUT_TEXT (const char *Name,unsigned MaxLength,const char *Value,bool
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1020,10 +984,7 @@ void HTM_INPUT_SEARCH (const char *Name,unsigned MaxLength,const char *Value,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1054,10 +1015,7 @@ void HTM_INPUT_TEL (const char *Name,const char *Value,bool SubmitOnChange,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1092,10 +1050,7 @@ void HTM_INPUT_EMAIL (const char *Name,unsigned MaxLength,const char *Value,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1126,10 +1081,7 @@ void HTM_INPUT_URL (const char *Name,const char *Value,bool SubmitOnChange,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1163,10 +1115,7 @@ void HTM_INPUT_FILE (const char *Name,const char *Accept,bool SubmitOnChange,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1227,10 +1176,7 @@ void HTM_INPUT_PASSWORD (const char *Name,const char *PlaceHolder,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1264,10 +1210,7 @@ void HTM_INPUT_NUMBER (const char *Name,long Min,long Max,long Value,bool Disabl
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1296,10 +1239,7 @@ void HTM_INPUT_RADIO (const char *Name,bool SubmitOnClick,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1331,10 +1271,7 @@ void HTM_INPUT_CHECKBOX (const char *Name,bool SubmitOnChange,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1395,10 +1332,7 @@ void HTM_TEXTAREA_Begin (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -1448,10 +1382,7 @@ void HTM_SELECT_Begin (bool SubmitOnChange,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -1540,10 +1471,7 @@ void HTM_OPTION (HTM_Type_t Type,const void *ValuePtr,bool Selected,bool Disable
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Content,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -1590,10 +1518,7 @@ void HTM_IMG (const char *URL,const char *Icon,const char *Title,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print attributes *****/
@ -1694,10 +1619,7 @@ void HTM_TxtF (const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Print HTML *****/
@ -1712,7 +1634,7 @@ void HTM_Txt (const char *Txt)
fputs (Txt,Gbl.F.Out);
}
void HTM_Space (void)
void HTM_NBSP (void)
{
HTM_Txt ("&nbsp;");
}

2
swad_HTML.h
View File

@ -164,7 +164,7 @@ void HTM_BR (void);
void HTM_TxtF (const char *fmt,...);
void HTM_Txt (const char *Txt);
void HTM_Space (void);
void HTM_NBSP (void);
void HTM_Colon (void);
void HTM_Comma (void);
void HTM_Hyphen (void);

17
swad_alert.c
View File

@ -106,10 +106,7 @@ void Ale_CreateAlert (Ale_AlertType_t Type,const char *Section,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Gbl.Alerts.List[i].Text,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
}
@ -267,9 +264,7 @@ void Ale_ShowAlert (Ale_AlertType_t AlertType,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Txt,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Show alert *****/
@ -341,9 +336,7 @@ void Ale_ShowAlertAndButton (Act_Action_t NextAction,const char *Anchor,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Txt,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/****** Print fix alert and button ******/
@ -369,9 +362,7 @@ void Ale_ShowAlertAndButton1 (Ale_AlertType_t AlertType,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Txt,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/****** Print start of fix alert and button ******/

5
swad_changelog.h
View File

@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.67 (2019-11-13)"
#define Log_PLATFORM_VERSION "SWAD 19.67.1 (2019-11-14)"
#define CSS_FILE "swad19.47.css"
#define JS_FILE "swad19.65.js"
/*
@ -495,7 +495,8 @@ ps2pdf source.ps destination.pdf
// TODO: Impedir la creación y edición de proyectos si no son editables.
// TODO: Code refactoring in HTML h1, title, meta, video, p, iframe, input hidden, area
Version 19.67: Nov 13, 2019 Filter projects by selected users. (246729 lines)
Version 19.67.1: Nov 14, 2019 Code refactoring in HTML. (246651 lines)
Version 19.67: Nov 14, 2019 Filter projects by selected users. (246729 lines)
Version 19.66.5: Nov 13, 2019 Code refactoring in list of users in attendance event. (246704 lines)
Version 19.66.4: Nov 13, 2019 Code refactoring in list of users in attendance event. (246729 lines)
Version 19.66.3: Nov 13, 2019 Filter projects by selected users. Not finished. (246656 lines)

2
swad_country.c
View File

@ -546,7 +546,7 @@ void Cty_ListCountries2 (void)
/***** Separation row *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"8\" class=\"DAT CM\"");
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
HTM_TR_End ();

2
swad_course.c
View File

@ -3275,7 +3275,7 @@ void Crs_AskRemoveOldCrss (void)
i == MonthsWithoutAccess,false,
"%u",i);
HTM_SELECT_End ();
HTM_Space ();
HTM_NBSP ();
HTM_TxtF (Txt_Eliminate_all_courses_whithout_users_PART_2_OF_2,
Cfg_PLATFORM_SHORT_NAME);
HTM_LABEL_End ();

45
swad_database.c
View File

@ -3290,10 +3290,7 @@ void DB_BuildQuery (char **Query,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
}
@ -3311,10 +3308,7 @@ unsigned long DB_QuerySELECT (MYSQL_RES **mysql_res,const char *MsgError,
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
return DB_QuerySELECTusingQueryStr (Query,mysql_res,MsgError);
@ -3369,10 +3363,7 @@ unsigned long DB_QueryCOUNT (const char *MsgError,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Make query "SELECT COUNT(*) FROM..." *****/
@ -3403,10 +3394,7 @@ void DB_QueryINSERT (const char *MsgError,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Query database and free query string pointer *****/
@ -3430,10 +3418,7 @@ long DB_QueryINSERTandReturnCode (const char *MsgError,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Query database and free query string pointer *****/
@ -3460,10 +3445,7 @@ void DB_QueryREPLACE (const char *MsgError,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Query database and free query string pointer *****/
@ -3487,10 +3469,7 @@ void DB_QueryUPDATE (const char *MsgError,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Query database and free query string pointer *****/
@ -3514,10 +3493,7 @@ void DB_QueryDELETE (const char *MsgError,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Query database and free query string pointer *****/
@ -3541,10 +3517,7 @@ void DB_Query (const char *MsgError,const char *fmt,...)
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Query,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // If memory allocation wasn't possible,
// or some other error occurs,
// vasprintf will return -1
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Lay_NotEnoughMemoryExit ();
/***** Query database and free query string pointer *****/

2
swad_department.c
View File

@ -171,7 +171,7 @@ void Dpt_SeeDepts (void)
/***** Separation row *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"3\" class=\"DAT\"");
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
HTM_TR_End ();

2
swad_enrolment.c
View File

@ -814,7 +814,7 @@ void Enr_AskRemoveOldUsrs (void)
Months == Usr_DEF_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_USRS,false,
"%u",Months);
HTM_SELECT_End ();
HTM_Space ();
HTM_NBSP ();
HTM_TxtF (Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_2_OF_2,
Cfg_PLATFORM_SHORT_NAME);
HTM_LABEL_End ();

4
swad_exam.c
View File

@ -1076,7 +1076,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
/***** Title *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"%s CM\"",StyleNormal);
HTM_Space ();
HTM_NBSP ();
HTM_BR ();
HTM_STRONG_Begin ();
HTM_Txt (Txt_EXAM_ANNOUNCEMENT);
@ -1086,7 +1086,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"%s LM\"",StyleNormal);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
HTM_TR_End ();

2
swad_figure.c
View File

@ -1480,7 +1480,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
{
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,
40,NULL,true);
HTM_Space ();
HTM_NBSP ();
}
HTM_Txt (Ins.FullName);
Frm_LinkFormEnd ();

12
swad_file_browser.c
View File

@ -4127,7 +4127,7 @@ static void Brw_ShowAndStoreSizeOfFileTree (void)
Brw_StoreSizeOfFileTreeInDB ();
}
else
HTM_Space (); // Blank to occupy the same space as the text for the browser size
HTM_NBSP (); // Blank to occupy the same space as the text for the browser size
HTM_DIV_End ();
}
@ -6258,7 +6258,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
}
/***** Write name of the folder *****/
HTM_Space ();
HTM_NBSP ();
if (Gbl.FileBrowser.ICanEditFileOrFolder) // Can I rename this folder?
{
HTM_INPUT_TEXT ("NewFolderName",Brw_MAX_CHARS_FOLDER,Gbl.FileBrowser.FilFolLnk.Name,true,
@ -6277,7 +6277,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
HTM_STRONG_Begin ();
HTM_Txt (FileNameToShow);
HTM_STRONG_End ();
HTM_Space ();
HTM_NBSP ();
if ((Level == 1) &&
(Gbl.FileBrowser.Type == Brw_ADMI_ASG_USR ||
Gbl.FileBrowser.Type == Brw_ADMI_ASG_CRS))
@ -6298,7 +6298,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
HTM_TD_Begin ("class=\"%s LM\" style=\"width:99%%;\"",
Gbl.FileBrowser.TxtStyle);
HTM_Space ();
HTM_NBSP ();
HTM_DIV_Begin ("class=\"FILENAME\"");
Frm_StartForm (Brw_ActDowFile[Gbl.FileBrowser.Type]);
@ -6444,7 +6444,7 @@ static void Brw_WriteFileSizeAndDate (struct FileMetadata *FileMetadata)
/***** Write the date *****/
HTM_TD_Begin ("class=\"%s RM COLOR%u\"",
Gbl.FileBrowser.TxtStyle,Gbl.RowEvenOdd);
HTM_Space ();
HTM_NBSP ();
if (Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_FILE ||
Gbl.FileBrowser.FilFolLnk.Type == Brw_IS_LINK)
{
@ -12144,7 +12144,7 @@ void Brw_AskRemoveOldFiles (void)
Months == Brw_DEF_MONTHS_TO_REMOVE_OLD_FILES,false,
"%u",Months);
HTM_SELECT_End ();
HTM_Space ();
HTM_NBSP ();
HTM_TxtF (Txt_Remove_files_older_than_PART_2_OF_2,
Cfg_PLATFORM_SHORT_NAME);
HTM_LABEL_End ();

2
swad_hierarchy.c
View File

@ -212,7 +212,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to go to the system *****/
HTM_DIV_Begin ("class=\"BC %s\"",ClassTxt);
HTM_Space ();
HTM_NBSP ();
Frm_StartFormGoTo (ActMnu);
Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys);

2
swad_holiday.c
View File

@ -164,7 +164,7 @@ void Hld_SeeHolidays (void)
HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\"");
HTM_Space ();
HTM_NBSP ();
switch (Gbl.Hlds.Lst[NumHld].HldTyp)
{
case Hld_HOLIDAY:

2
swad_layout.c
View File

@ -1432,7 +1432,7 @@ static void Lay_WriteAboutZone (void)
for (i = 0;
i < 5;
i++)
HTM_Space ();
HTM_NBSP ();
/* Time to generate and send page */
Sta_WriteTimeToGenerateAndSendPage ();

6
swad_match.c
View File

@ -2739,12 +2739,12 @@ static void Mch_DrawEmptyRowScore (unsigned NumRow,double MinScore,double MaxSco
if (NumRow == 0)
{
Str_WriteDoubleNumToFile (Gbl.F.Out,MaxScore);
HTM_Space ();
HTM_NBSP ();
}
else if (NumRow == Mch_NUM_ROWS_SCORE - 1)
{
Str_WriteDoubleNumToFile (Gbl.F.Out,MinScore);
HTM_Space ();
HTM_NBSP ();
}
HTM_TD_End ();
@ -2809,7 +2809,7 @@ static void Mch_DrawScoreRow (double Score,double MinScore,double MaxScore,
/* Write score */
HTM_TD_Begin ("class=\"MCH_SCO_SCO\"");
Str_WriteDoubleNumToFile (Gbl.F.Out,Score);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Draw bar and write number of users for this score */

2
swad_message.c
View File

@ -3377,7 +3377,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
HTM_Txt (UsrDat->FullName);
if (Act_GetSuperAction (Gbl.Action.Act) == ActSeeRcvMsg)
{
HTM_Space ();
HTM_NBSP ();
if (Msg_CheckIfUsrIsBanned (UsrDat->UsrCod,Gbl.Usrs.Me.UsrDat.UsrCod))
// Sender is banned
Msg_PutFormToUnbanSender (UsrDat);

2
swad_place.c
View File

@ -159,7 +159,7 @@ void Plc_SeePlaces (void)
/***** Separation row *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"DAT\"");
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
HTM_TR_End ();

2
swad_profile.c
View File

@ -570,7 +570,7 @@ static void Prf_ShowNumFilesCurrentlyPublished (const struct UsrData *UsrDat)
HTM_TxtF ("%u&nbsp;%s",NumFiles,(NumFiles == 1) ? Txt_file :
Txt_files);
HTM_Space ();
HTM_NBSP ();
HTM_Txt ("(");
HTM_TxtF ("%u&nbsp;%s",NumPublicFiles,Txt_public_FILES);
HTM_Txt (")");

2
swad_record.c
View File

@ -1808,7 +1808,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
TypeOfView == Rec_CRS_LIST_SEVERAL_RECORDS)
{
HTM_SPAN_Begin ("class=\"DAT_SMALL\"");
HTM_Space ();
HTM_NBSP ();
HTM_TxtF ("(%s)",Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]);
HTM_SPAN_End ();
}

24
swad_statistic.c
View File

@ -1712,7 +1712,7 @@ static void Sta_ShowDetailedAccessesList (unsigned long NumRows,MYSQL_RES *mysql
/* Write the user's ID if user is a student */
HTM_TD_Begin ("class=\"LOG CT COLOR%u\"",Gbl.RowEvenOdd);
ID_WriteUsrIDs (&UsrDat,NULL);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write the first name and the surnames */
@ -1851,7 +1851,7 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res)
/* Write the user's ID if user is a student in current course */
HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd);
ID_WriteUsrIDs (&UsrDat,NULL);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write the name and the surnames */
@ -1886,7 +1886,7 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res)
NULL,
"class=\"LT\" style=\"width:%upx; height:10px; padding-top:4px;\"",
BarWidth);
HTM_Space ();
HTM_NBSP ();
}
Str_WriteDoubleNumToFile (Gbl.F.Out,Hits.Num);
HTM_TD_End ();
@ -3200,7 +3200,7 @@ static void Sta_ShowNumHitsPerPlugin (unsigned long NumRows,
HTM_Txt (Plg.Name);
else
HTM_Txt ("?");
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Draw bar proportional to number of hits */
@ -3377,7 +3377,7 @@ static void Sta_ShowNumHitsPerCountry (unsigned long NumRows,
HTM_TD_Begin ("class=\"LOG RM\"");
if (CtyCod > 0)
HTM_UnsignedLong (++Ranking);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write country */
@ -3467,7 +3467,7 @@ static void Sta_ShowNumHitsPerInstitution (unsigned long NumRows,
HTM_TD_Begin ("class=\"LOG RT\"");
if (InsCod > 0)
HTM_UnsignedLong (++Ranking);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write institution */
@ -3559,7 +3559,7 @@ static void Sta_ShowNumHitsPerCentre (unsigned long NumRows,
HTM_TD_Begin ("class=\"LOG RT\"");
if (CtrCod > 0)
HTM_UnsignedLong (++Ranking);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write centre */
@ -3651,7 +3651,7 @@ static void Sta_ShowNumHitsPerDegree (unsigned long NumRows,
HTM_TD_Begin ("class=\"LOG RT\"");
if (DegCod > 0)
HTM_UnsignedLong (++Ranking);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write degree */
@ -3755,7 +3755,7 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
HTM_TD_Begin ("class=\"LOG RT\"");
if (CrsOK)
HTM_UnsignedLong (++Ranking);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write degree */
@ -3767,7 +3767,7 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
HTM_Txt (Txt_YEAR_OF_DEGREE[Crs.Year]);
else
HTM_Hyphen ();
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/* Write course, including link */
@ -3785,7 +3785,7 @@ static void Sta_ShowNumHitsPerCourse (unsigned long NumRows,
}
else
HTM_Hyphen ();
HTM_Space ();
HTM_NBSP ();
if (CrsOK)
Frm_EndForm ();
HTM_TD_End ();
@ -3859,7 +3859,7 @@ static void Sta_DrawBarNumHits (char Color,
free (Icon);
/***** Write the number of hits *****/
HTM_Space ();
HTM_NBSP ();
Str_WriteDoubleNumToFile (Gbl.F.Out,HitsNum);
HTM_TxtF ("&nbsp;(%u",(unsigned) (((HitsNum * 100.0) /
HitsTotal) + 0.5));

6
swad_syllabus.c
View File

@ -708,7 +708,7 @@ static void Syl_ShowRowSyllabus (unsigned NumItem,
StyleSyllabus[Level],Gbl.RowEvenOdd,
Level * Syl_WIDTH_NUM_SYLLABUS);
if (Level == 1)
HTM_Space ();
HTM_NBSP ();
HTM_TxtF ("%s&nbsp;",StrItemCod);
HTM_TD_End ();
@ -899,9 +899,9 @@ static void Syl_PutFormItemSyllabus (bool NewItem,unsigned NumItem,int Level,int
StyleSyllabus[Level],Gbl.RowEvenOdd,
Level * Syl_WIDTH_NUM_SYLLABUS);
if (Level == 1)
HTM_Space ();
HTM_NBSP ();
Syl_WriteNumItem (NULL,Gbl.F.Out,Level,CodItem);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
}

2
swad_test.c
View File

@ -3547,7 +3547,7 @@ void Tst_WriteAnsTF (char AnsTF)
HTM_Txt (Txt_TF_QST[1]);
break;
default: // no answer
HTM_Space ();
HTM_NBSP ();
break;
}
}

27
swad_user.c
View File

@ -2808,13 +2808,11 @@ void Usr_WriteLoggedUsrHead (void)
HTM_Txt (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
Frm_LinkFormEnd ();
Frm_EndForm ();
HTM_TxtF ("%s&nbsp;",":");
HTM_Colon ();
}
else
{
Rol_PutFormToChangeMyRole ("SEL_ROLE");
HTM_Space ();
}
HTM_NBSP ();
/***** Show my photo *****/
ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&Gbl.Usrs.Me.UsrDat,PhotoURL);
@ -3726,7 +3724,7 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat)
/****** Write user's ID ******/
HTM_TD_Begin ("class=\"DAT_SMALL LM COLOR%u\"",Gbl.RowEvenOdd);
ID_WriteUsrIDs (UsrDat,NULL);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/***** Write rest of guest's main data *****/
@ -3830,7 +3828,7 @@ static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames)
"DAT_SMALL",
Gbl.RowEvenOdd);
ID_WriteUsrIDs (UsrDat,NULL);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/***** Write rest of main student's data *****/
@ -3949,7 +3947,7 @@ static void Usr_WriteRowTchAllData (struct UsrData *UsrDat)
"DAT_SMALL",
Gbl.RowEvenOdd);
ID_WriteUsrIDs (UsrDat,NULL);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/***** Write rest of main teacher's data *****/
@ -4027,7 +4025,7 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
"DAT_SMALL",
Gbl.RowEvenOdd);
ID_WriteUsrIDs (UsrDat,NULL);
HTM_Space ();
HTM_NBSP ();
HTM_TD_End ();
/***** Write rest of main administrator's data *****/
@ -4123,7 +4121,7 @@ static void Usr_WriteUsrData (const char *BgColor,
/***** Write data *****/
HTM_Txt (Data);
if (NonBreak)
HTM_Space ();
HTM_NBSP ();
/***** End link *****/
if (Link)
@ -5702,7 +5700,8 @@ void Usr_CreateListSelectedUsrsCodsAndFillWithOtherUsr (void)
/***** Create list of user codes and put encrypted user code in it *****/
if (!Gbl.Usrs.Selected.List[Rol_UNK])
{
if ((Gbl.Usrs.Selected.List[Rol_UNK] = (char *) malloc (Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1)) == NULL)
if ((Gbl.Usrs.Selected.List[Rol_UNK] =
(char *) malloc (Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64 + 1)) == NULL)
Lay_NotEnoughMemoryExit ();
Str_Copy (Gbl.Usrs.Selected.List[Rol_UNK],Gbl.Usrs.Other.UsrDat.EncryptedUsrCod,
Cry_BYTES_ENCRYPTED_STR_SHA256_BASE64);
@ -5736,7 +5735,7 @@ void Usr_GetListsSelectedUsrsCods (void)
Usr_MAX_BYTES_LIST_ENCRYPTED_USR_CODS);
/***** Get list of selected users for each possible role *****/
for (Role = Rol_TCH; // From the highest possible role of selected users...
for (Role = Rol_TCH; // From the highest possible role of selected users...
Role >= Rol_GST; // ...downto the lowest possible role of selected users
Role--)
if (Usr_ParamUsrCod[Role])
@ -9011,17 +9010,17 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
if (UsrDat.FirstName[0])
HTM_Txt (UsrDat.FirstName);
else
HTM_Space ();
HTM_NBSP ();
HTM_BR ();
if (UsrDat.Surname1[0])
HTM_Txt (UsrDat.Surname1);
else
HTM_Space ();
HTM_NBSP ();
HTM_BR ();
if (UsrDat.Surname2[0])
HTM_Txt (UsrDat.Surname2);
else
HTM_Space ();
HTM_NBSP ();
HTM_DIV_End ();