Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-05-29 04:53:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 16.91.5

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-12-08 23:15:11 +01:00
parent fd1edc071b
commit ead250562c
2 changed files with 3 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
swad_agenda.c
View File

@ -88,7 +88,6 @@ static void Agd_PutIconToShowQR (void);
static void Agd_PutButtonToCreateNewEvent (void);
static void Agd_PutParamsToCreateNewEvent (void);
static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod);
static void Agd_WriteEventAuthor (struct AgendaEvent *AgdEvent);
static void Agd_GetParamEventOrderType (void);
static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent);
@ -616,9 +615,6 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
"<td colspan=\"2\" class=\"LEFT_TOP COLOR%u\">",
Gbl.RowEvenOdd);
/* Author of the event */
Agd_WriteEventAuthor (&AgdEvent);
/* Forms to remove/edit this event */
switch (AgendaType)
{
@ -653,51 +649,7 @@ static void Agd_ShowOneEvent (Agd_AgendaType_t AgendaType,long AgdCod)
}
/*****************************************************************************/
/*********************** Write the author of an event ************************/
/*****************************************************************************/
static void Agd_WriteEventAuthor (struct AgendaEvent *AgdEvent)
{
bool ShowPhoto = false;
char PhotoURL[PATH_MAX+1];
char FirstName[Usr_MAX_BYTES_NAME+1];
char Surnames[2*(Usr_MAX_BYTES_NAME+1)];
struct UsrData UsrDat;
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
/***** Get data of author *****/
UsrDat.UsrCod = AgdEvent->UsrCod;
if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat))
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
/***** Show photo *****/
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO15x20",Pho_ZOOM,false);
/***** Write name *****/
strcpy (FirstName,UsrDat.FirstName);
strcpy (Surnames,UsrDat.Surname1);
if (UsrDat.Surname2[0])
{
strcat (Surnames," ");
strcat (Surnames,UsrDat.Surname2);
}
Str_LimitLengthHTMLStr (FirstName,8);
Str_LimitLengthHTMLStr (Surnames,8);
fprintf (Gbl.F.Out,"<span class=\"%s\">%s %s</span>",
AgdEvent->Hidden ? "MSG_AUT_LIGHT" :
"MSG_AUT",
FirstName,Surnames);
/***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat);
}
/*****************************************************************************/
/********* Get parameter with the type or order in list of events ************/
/********** Get parameter with the type or order in list of events ***********/
/*****************************************************************************/
static void Agd_GetParamEventOrderType (void)
@ -740,8 +692,6 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent)
extern const char *Txt_Event_visible_to_the_users_of_your_courses_click_to_make_it_private;
extern const char *Txt_Edit;
fprintf (Gbl.F.Out,"<div>");
Gbl.Agenda.AgdCodToEdit = AgdEvent->AgdCod; // Used as parameter in contextual links
/***** Put form to remove event *****/
@ -779,8 +729,6 @@ static void Agd_PutFormsToRemEditOneEvent (struct AgendaEvent *AgdEvent)
"lock-on64x64.png",
Txt_Event_private_click_to_make_it_visible_to_the_users_of_your_courses,NULL,
NULL);
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/

3
swad_changelog.h
View File

@ -185,13 +185,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.91.4 (2016-12-07)"
#define Log_PLATFORM_VERSION "SWAD 16.91.5 (2016-12-08)"
#define CSS_FILE "swad16.86.5.css"
#define JS_FILE "swad16.90.2.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1
/*
Version 16.91.5: Dec 08, 2016 Removed author in agenda events. (210148 lines)
Version 16.91.4: Dec 07, 2016 Default ordering in agendas is start date. (210189 lines)
Version 16.91.3: Dec 07, 2016 Dates in agendas are ordered from old to new. (210188 lines)
Version 16.91.2: Dec 07, 2016 Changes in permissions to view public agendas.