From 2cc8a82af1567073c5362277546a925849150a13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 14 Apr 2016 19:05:52 +0200 Subject: [PATCH] Version 15.194.1 --- swad_changelog.h | 3 ++- swad_forum.c | 2 +- swad_image.c | 2 +- swad_image.h | 2 +- swad_message.c | 2 +- swad_social.c | 4 ++-- swad_test.c | 25 ++++++++++++------------- 7 files changed, 20 insertions(+), 20 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index eefe899e3..0c8a9e38f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -137,13 +137,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.194 (2016-04-14)" +#define Log_PLATFORM_VERSION "SWAD 15.194.1 (2016-04-14)" #define CSS_FILE "swad15.193.css" #define JS_FILE "swad15.193.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 15.194.1: Apr 14, 2016 Code refactoring related to uploading images. (199391 lines) Version 15.194: Apr 14, 2016 Code refactoring related to uploading images. (199391 lines) Version 15.193: Apr 14, 2016 New layout of button used to upload images. (199357 lines) Version 15.192.13:Apr 13, 2016 Fixed bug in file upload, reported by Christian Morillas Gutiérrez. (199341 lines) diff --git a/swad_forum.c b/swad_forum.c index 724938ef4..2523a3bf5 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -3905,7 +3905,7 @@ void For_RecForumPst (void) ParamUploadImg.Action = "ImgAct"; ParamUploadImg.File = "ImgFil"; ParamUploadImg.Title = "ImgTit"; - Img_GetImageFromForm (0,&Image,NULL, + Img_GetImageFromForm (-1,&Image,NULL, &ParamUploadImg, For_IMAGE_SAVED_MAX_WIDTH, For_IMAGE_SAVED_MAX_HEIGHT, diff --git a/swad_image.c b/swad_image.c index bc1fe0073..1f2e48d05 100644 --- a/swad_image.c +++ b/swad_image.c @@ -207,7 +207,7 @@ void Img_PutImageUploader (const char *ClassImgTit, /*****************************************************************************/ void Img_GetImageFromForm (unsigned NumOpt,struct Image *Image, - void (*GetImageFromDB) (unsigned NumOpt,struct Image *Image), + void (*GetImageFromDB) (int NumOpt,struct Image *Image), struct ParamUploadImg *ParamUploadImg, unsigned Width,unsigned Height,unsigned Quality) { diff --git a/swad_image.h b/swad_image.h index b0ea7956f..707e762c3 100644 --- a/swad_image.h +++ b/swad_image.h @@ -112,7 +112,7 @@ void Img_GetImageNameAndTitleFromRow (const char *Name,const char *Title, void Img_PutImageUploader (const char *ClassImgTit, struct ParamUploadImg *ParamUploadImg); -void Img_GetImageFromForm (unsigned NumOpt,struct Image *Image, +void Img_GetImageFromForm (int NumOpt,struct Image *Image, void (*GetImageFromDB) (unsigned NumOpt,struct Image *Image), struct ParamUploadImg *ParamUploadImg, unsigned Width,unsigned Height,unsigned Quality); diff --git a/swad_message.c b/swad_message.c index b77142ba7..dfcb0f2f5 100644 --- a/swad_message.c +++ b/swad_message.c @@ -780,7 +780,7 @@ void Msg_RecMsgFromUsr (void) ParamUploadImg.Action = "ImgAct"; ParamUploadImg.File = "ImgFil"; ParamUploadImg.Title = "ImgTit"; - Img_GetImageFromForm (0,&Image,NULL, + Img_GetImageFromForm (-1,&Image,NULL, &ParamUploadImg, Msg_IMAGE_SAVED_MAX_WIDTH, Msg_IMAGE_SAVED_MAX_HEIGHT, diff --git a/swad_social.c b/swad_social.c index 711e05279..f376de60b 100644 --- a/swad_social.c +++ b/swad_social.c @@ -2096,7 +2096,7 @@ static long Soc_ReceiveSocialPost (void) ParamUploadImg.Action = "ImgAct"; ParamUploadImg.File = "ImgFil"; ParamUploadImg.Title = "ImgTit"; - Img_GetImageFromForm (0,&Image,NULL, + Img_GetImageFromForm (-1,&Image,NULL, &ParamUploadImg, Soc_IMAGE_SAVED_MAX_WIDTH, Soc_IMAGE_SAVED_MAX_HEIGHT, @@ -2856,7 +2856,7 @@ static long Soc_ReceiveComment (void) ParamUploadImg.Action = "ImgAct"; ParamUploadImg.File = "ImgFil"; ParamUploadImg.Title = "ImgTit"; - Img_GetImageFromForm (0,&Image,NULL, + Img_GetImageFromForm (-1,&Image,NULL, &ParamUploadImg, Soc_IMAGE_SAVED_MAX_WIDTH, Soc_IMAGE_SAVED_MAX_HEIGHT, diff --git a/swad_test.c b/swad_test.c index dacb0448a..2890b25e7 100644 --- a/swad_test.c +++ b/swad_test.c @@ -224,7 +224,7 @@ static void Tst_InitImagesOfQuestion (void); static void Tst_FreeImagesOfQuestion (void); static void Tst_GetQstDataFromDB (char *Stem,char *Feedback); -static void Tst_GetImageFromDB (unsigned NumOpt,struct Image *Image); +static void Tst_GetImageFromDB (int NumOpt,struct Image *Image); static Tst_AnswerType_t Tst_ConvertFromUnsignedStrToAnsTyp (const char *UnsignedStr); static void Tst_GetQstFromForm (char *Stem,char *Feedback); @@ -5020,26 +5020,25 @@ static void Tst_GetQstDataFromDB (char *Stem,char *Feedback) /*****************************************************************************/ /***** Get possible image associated with a test question from database ******/ /*****************************************************************************/ -// NumOpt >= Tst_MAX_OPTIONS_PER_QUESTION ==> image associated to stem -// 0 <= NumOpt < Tst_MAX_OPTIONS_PER_QUESTION ==> image associated to answer +// NumOpt < 0 ==> image associated to stem +// NumOpt >= 0 ==> image associated to answer -static void Tst_GetImageFromDB (unsigned NumOpt,struct Image *Image) +static void Tst_GetImageFromDB (int NumOpt,struct Image *Image) { char Query[256]; MYSQL_RES *mysql_res; MYSQL_ROW row; /***** Build query depending on NumOpt *****/ - if (NumOpt < Tst_MAX_OPTIONS_PER_QUESTION) - // Get image associated to answer - sprintf (Query,"SELECT ImageName,ImageTitle FROM tst_answers" - " WHERE QstCod='%ld' AND AnsInd='%u'", - Gbl.Test.QstCod,NumOpt); - else + if (NumOpt < 0) // Get image associated to stem sprintf (Query,"SELECT ImageName,ImageTitle FROM tst_questions" " WHERE QstCod='%ld' AND CrsCod='%ld'", - Gbl.Test.QstCod,Gbl.CurrentCrs.Crs.CrsCod); + Gbl.Test.QstCod,Gbl.CurrentCrs.Crs.CrsCod); // Get image associated to answer + else + sprintf (Query,"SELECT ImageName,ImageTitle FROM tst_answers" + " WHERE QstCod='%ld' AND AnsInd='%u'", + Gbl.Test.QstCod,(unsigned) NumOpt); /***** Query database *****/ DB_QuerySELECT (Query,&mysql_res,"can not get image name"); @@ -5190,7 +5189,7 @@ static void Tst_GetQstFromForm (char *Stem,char *Feedback) ParamUploadImg.Action = "ImgAct"; ParamUploadImg.File = "ImgFil"; ParamUploadImg.Title = "ImgTit"; - Img_GetImageFromForm (Tst_MAX_OPTIONS_PER_QUESTION,&Gbl.Test.Image, + Img_GetImageFromForm (-1,&Gbl.Test.Image, Tst_GetImageFromDB, &ParamUploadImg, Tst_IMAGE_SAVED_MAX_WIDTH, @@ -5254,7 +5253,7 @@ static void Tst_GetQstFromForm (char *Stem,char *Feedback) ParamUploadImg.Action = ParamAction; ParamUploadImg.File = ParamFile; ParamUploadImg.Title = ParamTitle; - Img_GetImageFromForm (NumOpt,&Gbl.Test.Answer.Options[NumOpt].Image, + Img_GetImageFromForm ((int) NumOpt,&Gbl.Test.Answer.Options[NumOpt].Image, Tst_GetImageFromDB, &ParamUploadImg, Tst_IMAGE_SAVED_MAX_WIDTH,