mirror of
https://github.com/acanas/swad-core.git
synced 2024-09-20 00:02:42 +02:00
Version19.59
This commit is contained in:
parent
b215723389
commit
2a58312fd1
30
swad_HTML.c
30
swad_HTML.c
|
@ -856,6 +856,36 @@ void HTM_SCRIPT_End (void)
|
||||||
HTM_SCRIPT_NestingLevel--;
|
HTM_SCRIPT_NestingLevel--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/********************************* Parameters ********************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void HTM_PARAM (const char *Name,
|
||||||
|
const char *fmt,...)
|
||||||
|
{
|
||||||
|
va_list ap;
|
||||||
|
int NumBytesPrinted;
|
||||||
|
char *Value;
|
||||||
|
|
||||||
|
if (fmt)
|
||||||
|
if (fmt[0])
|
||||||
|
{
|
||||||
|
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
|
||||||
|
Lay_NotEnoughMemoryExit ();
|
||||||
|
|
||||||
|
/***** Print HTML *****/
|
||||||
|
fprintf (Gbl.F.Out,"\n<param name=\"%s\" value=\"%s\">",Name,Value);
|
||||||
|
|
||||||
|
free (Value);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/*********************************** Labels **********************************/
|
/*********************************** Labels **********************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -103,6 +103,9 @@ void HTM_A_End (void);
|
||||||
void HTM_SCRIPT_Begin (const char *URL,const char *CharSet);
|
void HTM_SCRIPT_Begin (const char *URL,const char *CharSet);
|
||||||
void HTM_SCRIPT_End (void);
|
void HTM_SCRIPT_End (void);
|
||||||
|
|
||||||
|
void HTM_PARAM (const char *Name,
|
||||||
|
const char *fmt,...);
|
||||||
|
|
||||||
void HTM_LABEL_Begin (const char *fmt,...);
|
void HTM_LABEL_Begin (const char *fmt,...);
|
||||||
void HTM_LABEL_End (void);
|
void HTM_LABEL_End (void);
|
||||||
|
|
||||||
|
|
|
@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
#define Log_PLATFORM_VERSION "SWAD 19.58 (2019-11-09)"
|
#define Log_PLATFORM_VERSION "SWAD 19.59 (2019-11-09)"
|
||||||
#define CSS_FILE "swad19.47.css"
|
#define CSS_FILE "swad19.47.css"
|
||||||
#define JS_FILE "swad19.39.js"
|
#define JS_FILE "swad19.39.js"
|
||||||
/*
|
/*
|
||||||
|
@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
|
||||||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||||
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
|
// TODO: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
|
||||||
|
|
||||||
|
Version 19.59: Nov 09, 2019 Code refactoring in HTML params. (246187 lines)
|
||||||
Version 19.58: Nov 09, 2019 Code refactoring in HTML definition lists. (246169 lines)
|
Version 19.58: Nov 09, 2019 Code refactoring in HTML definition lists. (246169 lines)
|
||||||
Version 19.57: Nov 09, 2019 Code refactoring in HTML definition lists. (246156 lines)
|
Version 19.57: Nov 09, 2019 Code refactoring in HTML definition lists. (246156 lines)
|
||||||
Version 19.56: Nov 08, 2019 Fixed bug in groups.
|
Version 19.56: Nov 08, 2019 Fixed bug in groups.
|
||||||
|
|
29
swad_chat.c
29
swad_chat.c
|
@ -593,25 +593,16 @@ void Cht_OpenChatWindow (void)
|
||||||
Str_NO_SKIP_HTML_COMMENTS);
|
Str_NO_SKIP_HTML_COMMENTS);
|
||||||
|
|
||||||
/***** Write parameters *****/
|
/***** Write parameters *****/
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"nick\" value=\"N%s\">",
|
HTM_PARAM ("nick","N%s",Gbl.Session.Id);
|
||||||
Gbl.Session.Id);
|
HTM_PARAM ("realname","%s",UsrName);
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"realname\" value=\"%s\">",
|
HTM_PARAM ("host","%s",Gbl.IP);
|
||||||
UsrName);
|
HTM_PARAM ("server_name","%s",Cfg_PLATFORM_SERVER);
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"host\" value=\"%s\">",
|
HTM_PARAM ("port","%u",5000);
|
||||||
Gbl.IP);
|
HTM_PARAM ("image_bl","%s/usr_bl.jpg",Cfg_URL_ICON_PUBLIC);
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"server_name\" value=\"%s\">",
|
HTM_PARAM ("image_url","%s/%s.jpg",Cfg_URL_PHOTO_PUBLIC,Gbl.Usrs.Me.UsrDat.Photo);
|
||||||
Cfg_PLATFORM_SERVER);
|
HTM_PARAM ("channel_name","%s",ListRoomCodes);
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"port\" value=\"5000\">");
|
HTM_PARAM ("tab","%s",ListRoomShrtNames);
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"image_bl\" value=\"%s/usr_bl.jpg\">",
|
HTM_PARAM ("topic","%s",ListRoomFullNames);
|
||||||
Cfg_URL_ICON_PUBLIC);
|
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"image_url\" value=\"%s/%s.jpg\">",
|
|
||||||
Cfg_URL_PHOTO_PUBLIC,Gbl.Usrs.Me.UsrDat.Photo);
|
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"channel_name\" value=\"%s\">",
|
|
||||||
ListRoomCodes);
|
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"tab\" value=\"%s\">",
|
|
||||||
ListRoomShrtNames);
|
|
||||||
fprintf (Gbl.F.Out,"\n<param name=\"topic\" value=\"%s\">",
|
|
||||||
ListRoomFullNames);
|
|
||||||
|
|
||||||
/***** Copy index.html file until the end *****/
|
/***** Copy index.html file until the end *****/
|
||||||
Str_WriteUntilStrFoundInFileIncludingStr (Gbl.F.Out,FileChat,"</html>",
|
Str_WriteUntilStrFoundInFileIncludingStr (Gbl.F.Out,FileChat,"</html>",
|
||||||
|
|
Loading…
Reference in New Issue
Block a user