diff --git a/swad_action.c b/swad_action.c index c748ed64..430e3ab7 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4450,8 +4450,9 @@ void Act_LinkFormSubmitId (const char *Title,const char *LinkStyle,const char *I if (LinkStyle) if (LinkStyle[0]) fprintf (Gbl.F.Out," class=\"%s\"",LinkStyle); - fprintf (Gbl.F.Out," onclick=\"javascript:" - "document.getElementById('%s').submit();return false;\">", + fprintf (Gbl.F.Out," onclick=\"" + "document.getElementById('%s').submit();" + "return false;\">", Id); } @@ -4464,10 +4465,11 @@ void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle) if (LinkStyle) if (LinkStyle[0]) fprintf (Gbl.F.Out," class=\"%s\"",LinkStyle); - fprintf (Gbl.F.Out," onclick=\"javascript:" + fprintf (Gbl.F.Out," onclick=\"" "document.getElementById('update_%d').style.display='none';" // Icon to be hiden on click - " document.getElementById('updating_%d').style.display='';" // Icon to be shown on click - " document.getElementById('%s').submit();return false;\">", + "document.getElementById('updating_%d').style.display='';" // Icon to be shown on click + "document.getElementById('%s').submit();" + "return false;\">", Gbl.NumForm, Gbl.NumForm, Gbl.FormId); diff --git a/swad_assignment.c b/swad_assignment.c index dd60cabb..e7def5ad 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -618,16 +618,6 @@ void Asg_GetDataOfAssignmentByCod (struct Assignment *Asg) char Query[1024]; /***** Build query *****/ - /* - sprintf (Query,"SELECT AsgCod,Hidden,UsrCod," - "DATE_FORMAT(StartTime,'%%Y%%m%%d%%H%%i%%S')," - "DATE_FORMAT(EndTime,'%%Y%%m%%d%%H%%i%%S')," - "NOW() BETWEEN StartTime AND EndTime," - "Title,Folder" - " FROM assignments" - " WHERE AsgCod='%ld' AND CrsCod='%ld'", - Asg->AsgCod,Gbl.CurrentCrs.Crs.CrsCod); - */ sprintf (Query,"SELECT AsgCod,Hidden,UsrCod," "UNIX_TIMESTAMP(StartTime)," "UNIX_TIMESTAMP(EndTime)," @@ -650,16 +640,6 @@ void Asg_GetDataOfAssignmentByFolder (struct Assignment *Asg) char Query[1024]; /***** Query database *****/ - /* - sprintf (Query,"SELECT AsgCod,Hidden,UsrCod," - "DATE_FORMAT(StartTime,'%%Y%%m%%d%%H%%i%%S')," - "DATE_FORMAT(EndTime,'%%Y%%m%%d%%H%%i%%S')," - "NOW() BETWEEN StartTime AND EndTime," - "Title,Folder" - " FROM assignments" - " WHERE CrsCod='%ld' AND Folder='%s'", - Gbl.CurrentCrs.Crs.CrsCod,Asg->Folder); - */ sprintf (Query,"SELECT AsgCod,Hidden,UsrCod," "UNIX_TIMESTAMP(StartTime)," "UNIX_TIMESTAMP(EndTime)," @@ -706,17 +686,9 @@ static void Asg_GetDataOfAssignment (struct Assignment *Asg,const char *Query) Asg->UsrCod = Str_ConvertStrCodToLongCod (row[2]); /* Get start date (row[3] holds the start date in YYYYMMDDHHMMSS format) */ - /* - if (!(Dat_GetDateTimeFromYYYYMMDDHHMMSS (&(Asg->DateTimes[Asg_START_TIME]),row[3]))) - Lay_ShowErrorAndExit ("Error when reading start date of assignment."); - */ Asg->TimeUTC[Asg_START_TIME] = Dat_GetUNIXTimeFromStr (row[3]); /* Get end date (row[4] holds the end date in YYYYMMDDHHMMSS format) */ - /* - if (!(Dat_GetDateTimeFromYYYYMMDDHHMMSS (&(Asg->DateTimes[Asg_END_TIME]),row[4]))) - Lay_ShowErrorAndExit ("Error when reading end date of assignment."); - */ Asg->TimeUTC[Asg_END_TIME] = Dat_GetUNIXTimeFromStr (row[4]); /* Get whether the assignment is open or closed (row(5)) */ @@ -806,12 +778,9 @@ static void Asg_GetAssignmentTxtFromDB (long AsgCod,char *Txt) void Asg_GetNotifAssignment (char *SummaryStr,char **ContentStr, long AsgCod,unsigned MaxChars,bool GetContent) { - // extern const char *Txt_Start_date; - // extern const char *Txt_End_date; char Query[512]; MYSQL_RES *mysql_res; MYSQL_ROW row; - // struct DateTime DateTimes[Asg_NUM_DATES]; SummaryStr[0] = '\0'; // Return nothing on error @@ -1064,22 +1033,7 @@ void Asg_RequestCreatOrEditAsg (void) { /* Initialize to empty assignment */ Asg.AsgCod = -1L; - /* - Asg.DateTimes[Asg_START_TIME].Date.Day = Gbl.Now.Date.Day; - Asg.DateTimes[Asg_START_TIME].Date.Month = Gbl.Now.Date.Month; - Asg.DateTimes[Asg_START_TIME].Date.Year = Gbl.Now.Date.Year; - Asg.DateTimes[Asg_START_TIME].Time.Hour = Gbl.Now.Time.Hour; - Asg.DateTimes[Asg_START_TIME].Time.Minute = Gbl.Now.Time.Minute; - Asg.DateTimes[Asg_START_TIME].Time.Second = Gbl.Now.Time.Second; - */ Asg.TimeUTC[Asg_START_TIME] = Gbl.TimeStartExecution; - /* - Asg.DateTimes[Asg_END_TIME ].Date.Day = Gbl.Now.Date.Day; - Asg.DateTimes[Asg_END_TIME ].Date.Month = Gbl.Now.Date.Month; - Asg.DateTimes[Asg_END_TIME ].Date.Year = Gbl.Now.Date.Year; - Asg.DateTimes[Asg_END_TIME ].Time.Hour = 23; - Asg.DateTimes[Asg_END_TIME ].Time.Minute = 59; - */ Asg.TimeUTC[Asg_END_TIME ] = Gbl.TimeStartExecution + (2 * 60 * 60); // +2 hours Asg.Open = true; Asg.Title[0] = '\0'; @@ -1141,28 +1095,12 @@ void Asg_RequestCreatOrEditAsg (void) The_ClassForm[Gbl.Prefs.Theme], Dates[StartOrEndTime]); - /* Date */ - /* - Dat_WriteFormDate (Gbl.Now.Date.Year-1,Gbl.Now.Date.Year+1, - NameSelectDay [StartOrEndTime], - NameSelectMonth[StartOrEndTime], - NameSelectYear [StartOrEndTime], - &(Asg.DateTimes[StartOrEndTime].Date), - false,false); - */ + /* Date-time */ Dat_WriteFormClientLocalDateTime (Id[StartOrEndTime], Asg.TimeUTC[StartOrEndTime], Gbl.Now.Date.Year-1,Gbl.Now.Date.Year+1, false,false); - /* Time */ - /* - Dat_WriteFormHourMinute (NameSelectHour [StartOrEndTime], - NameSelectMinute[StartOrEndTime], - &(Asg.DateTimes[StartOrEndTime].Time), - false,false); - */ - fprintf (Gbl.F.Out,"" "" "" @@ -1293,31 +1231,9 @@ void Asg_RecFormAssignment (void) Asg_GetDataOfAssignmentByCod (&OldAsg); } - /***** Get start date *****/ - /* - Dat_GetDateFromForm ("StartDay","StartMonth","StartYear", - &(NewAsg.DateTimes[Asg_START_TIME].Date.Day), - &(NewAsg.DateTimes[Asg_START_TIME].Date.Month), - &(NewAsg.DateTimes[Asg_START_TIME].Date.Year)); - Dat_GetHourMinuteFromForm ("StartHour","StartMinute", - &(NewAsg.DateTimes[Asg_START_TIME].Time.Hour), - &(NewAsg.DateTimes[Asg_START_TIME].Time.Minute)); - NewAsg.DateTimes[Asg_START_TIME].Time.Second = 0; - */ + /***** Get start/end date-times *****/ NewAsg.TimeUTC[Asg_START_TIME] = Dat_GetTimeUTCFromForm ("StartTimeUTC"); - - /***** Get end date *****/ - /* - Dat_GetDateFromForm ("EndDay","EndMonth","EndYear", - &(NewAsg.DateTimes[Asg_END_TIME].Date.Day), - &(NewAsg.DateTimes[Asg_END_TIME].Date.Month), - &(NewAsg.DateTimes[Asg_END_TIME].Date.Year)); - Dat_GetHourMinuteFromForm ("EndHour","EndMinute", - &(NewAsg.DateTimes[Asg_END_TIME].Time.Hour), - &(NewAsg.DateTimes[Asg_END_TIME].Time.Minute)); - NewAsg.DateTimes[Asg_END_TIME].Time.Second = 59; - */ - NewAsg.TimeUTC[Asg_END_TIME] = Dat_GetTimeUTCFromForm ("EndTimeUTC"); + NewAsg.TimeUTC[Asg_END_TIME ] = Dat_GetTimeUTCFromForm ("EndTimeUTC" ); /***** Get assignment title *****/ Par_GetParToText ("Title",NewAsg.Title,Asg_MAX_LENGTH_ASSIGNMENT_TITLE); @@ -1331,28 +1247,6 @@ void Asg_RecFormAssignment (void) Par_GetParToHTML ("Txt",Txt,Cns_MAX_BYTES_TEXT); // Store in HTML format (not rigorous) /***** Adjust dates *****/ - /* - if (NewAsg.DateTimes[Asg_START_TIME].Date.Day == 0 || - NewAsg.DateTimes[Asg_START_TIME].Date.Month == 0 || - NewAsg.DateTimes[Asg_START_TIME].Date.Year == 0) - { - NewAsg.DateTimes[Asg_START_TIME].Date.Day = Gbl.Now.Date.Day; - NewAsg.DateTimes[Asg_START_TIME].Date.Month = Gbl.Now.Date.Month; - NewAsg.DateTimes[Asg_START_TIME].Date.Year = Gbl.Now.Date.Year; - NewAsg.DateTimes[Asg_START_TIME].Time.Hour = Gbl.Now.Time.Hour; - NewAsg.DateTimes[Asg_START_TIME].Time.Minute = Gbl.Now.Time.Minute; - } - if (NewAsg.DateTimes[Asg_END_TIME].Date.Day == 0 || - NewAsg.DateTimes[Asg_END_TIME].Date.Month == 0 || - NewAsg.DateTimes[Asg_END_TIME].Date.Year == 0) - { - NewAsg.DateTimes[Asg_END_TIME].Date.Day = Gbl.Now.Date.Day; - NewAsg.DateTimes[Asg_END_TIME].Date.Month = Gbl.Now.Date.Month; - NewAsg.DateTimes[Asg_END_TIME].Date.Year = Gbl.Now.Date.Year; - NewAsg.DateTimes[Asg_END_TIME].Time.Hour = 23; - NewAsg.DateTimes[Asg_END_TIME].Time.Minute = 59; - } - */ if (NewAsg.TimeUTC[Asg_START_TIME] == 0) NewAsg.TimeUTC[Asg_START_TIME] = Gbl.TimeStartExecution; if (NewAsg.TimeUTC[Asg_END_TIME] == 0) @@ -1465,27 +1359,6 @@ static void Asg_CreateAssignment (struct Assignment *Asg,const char *Txt) char Query[1024+Cns_MAX_BYTES_TEXT]; /***** Create a new assignment *****/ - /* - sprintf (Query,"INSERT INTO assignments (CrsCod,UsrCod,StartTime,EndTime,Title,Folder,Txt)" - " VALUES ('%ld','%ld','%04u%02u%02u%02u%02u%02u','%04u%02u%02u%02u%02u%02u','%s','%s','%s')", - Gbl.CurrentCrs.Crs.CrsCod, - Gbl.Usrs.Me.UsrDat.UsrCod, - Asg->DateTimes[Asg_START_TIME].Date.Year, - Asg->DateTimes[Asg_START_TIME].Date.Month, - Asg->DateTimes[Asg_START_TIME].Date.Day, - Asg->DateTimes[Asg_START_TIME].Time.Hour, - Asg->DateTimes[Asg_START_TIME].Time.Minute, - Asg->DateTimes[Asg_START_TIME].Time.Second, - Asg->DateTimes[Asg_END_TIME ].Date.Year, - Asg->DateTimes[Asg_END_TIME ].Date.Month, - Asg->DateTimes[Asg_END_TIME ].Date.Day, - Asg->DateTimes[Asg_END_TIME ].Time.Hour, - Asg->DateTimes[Asg_END_TIME ].Time.Minute, - Asg->DateTimes[Asg_END_TIME ].Time.Second, - Asg->Title, - Asg->Folder, - Txt); - */ sprintf (Query,"INSERT INTO assignments" " (CrsCod,UsrCod,StartTime,EndTime,Title,Folder,Txt)" " VALUES" @@ -1520,28 +1393,6 @@ static void Asg_UpdateAssignment (struct Assignment *Asg,const char *Txt) char Query[1024+Cns_MAX_BYTES_TEXT]; /***** Update the data of the assignment *****/ - /* - sprintf (Query,"UPDATE assignments" - " SET StartTime='%04u%02u%02u%02u%02u%02u',EndTime='%04u%02u%02u%02u%02u%02u'," - "Title='%s',Folder='%s',Txt='%s'" - " WHERE AsgCod='%ld' AND CrsCod='%ld'", - Asg->DateTimes[Asg_START_TIME].Date.Year, - Asg->DateTimes[Asg_START_TIME].Date.Month, - Asg->DateTimes[Asg_START_TIME].Date.Day, - Asg->DateTimes[Asg_START_TIME].Time.Hour, - Asg->DateTimes[Asg_START_TIME].Time.Minute, - Asg->DateTimes[Asg_START_TIME].Time.Second, - Asg->DateTimes[Asg_END_TIME ].Date.Year, - Asg->DateTimes[Asg_END_TIME ].Date.Month, - Asg->DateTimes[Asg_END_TIME ].Date.Day , - Asg->DateTimes[Asg_END_TIME ].Time.Hour, - Asg->DateTimes[Asg_END_TIME ].Time.Minute, - Asg->DateTimes[Asg_END_TIME ].Time.Second, - Asg->Title, - Asg->Folder, - Txt, - Asg->AsgCod,Gbl.CurrentCrs.Crs.CrsCod); - */ sprintf (Query,"UPDATE assignments SET " "StartTime=FROM_UNIXTIME('%ld')," "EndTime=FROM_UNIXTIME('%ld')," diff --git a/swad_banner.c b/swad_banner.c index 5ac6c13a..c48cab82 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -354,8 +354,9 @@ static void Ban_ListBannersForEdition (void) fprintf (Gbl.F.Out,""); Act_FormStart (ActRenBanSho); Ban_PutParamBanCod (Ban->BanCod); - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Ban_MAX_LENGTH_SHORT_NAME,Ban->ShortName,Gbl.FormId); Act_FormEnd (); fprintf (Gbl.F.Out,""); @@ -364,8 +365,9 @@ static void Ban_ListBannersForEdition (void) fprintf (Gbl.F.Out,""); Act_FormStart (ActRenBanFul); Ban_PutParamBanCod (Ban->BanCod); - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Ban_MAX_LENGTH_FULL_NAME,Ban->FullName,Gbl.FormId); Act_FormEnd (); fprintf (Gbl.F.Out,""); @@ -376,7 +378,7 @@ static void Ban_ListBannersForEdition (void) Ban_PutParamBanCod (Ban->BanCod); fprintf (Gbl.F.Out,"", + " onchange=\"document.getElementById('%s').submit();\" />", Ban_MAX_LENGTH_IMAGE,Ban->Img,Gbl.FormId); Act_FormEnd (); fprintf (Gbl.F.Out,""); @@ -385,8 +387,9 @@ static void Ban_ListBannersForEdition (void) fprintf (Gbl.F.Out,""); Act_FormStart (ActChgBanWWW); Ban_PutParamBanCod (Ban->BanCod); - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Cns_MAX_LENGTH_WWW,Ban->WWW,Gbl.FormId); Act_FormEnd (); fprintf (Gbl.F.Out,"" @@ -910,14 +913,14 @@ void Ban_WriteMenuWithBanners (void) Act_FormStart (ActClkBan); Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod); Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW); - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" "\"%s\"" "", - Gbl.FormId, Gbl.Banners.Lst[NumBan].FullName, + Gbl.FormId, Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_BANNER, Gbl.Banners.Lst[NumBan].Img, Gbl.Banners.Lst[NumBan].ShortName, diff --git a/swad_centre.c b/swad_centre.c index 9ee2e913..d0577ac8 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -339,7 +339,7 @@ static void Ctr_Configuration (bool PrintView) ""); Act_FormStart (ActChgCtrPhoAtt); fprintf (Gbl.F.Out,"