Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-27 10:55:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.100.4

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-07 14:21:21 +01:00
parent 1814ed843b
commit 54849d19a1
4 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
swad_action.c
View File

@ -2327,7 +2327,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqSocPstGbl */{1491,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostGbl ,NULL}, /* ActReqSocPstGbl */{1491,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostGbl ,NULL},
/* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostGbl ,NULL}, /* ActRcvSocPstGbl */{1492,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostGbl ,NULL},
/* ActComSocNotUsr */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_CommentSocialNoteGbl ,NULL}, /* ActComSocNotUsr */{1503,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentGbl ,NULL},
/* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteGbl ,NULL}, /* ActShaSocNotGbl */{1495,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteGbl ,NULL},
/* ActUnsSocPubGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubGbl ,NULL}, /* ActUnsSocPubGbl */{1496,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubGbl ,NULL},
/* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubGbl ,NULL}, /* ActReqRemSocPubGbl*/{1494,-1,TabSoc,ActSeeSocTmlGbl ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubGbl ,NULL},
@ -2335,7 +2335,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActReqSocPstUsr */{1497,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostUsr ,NULL}, /* ActReqSocPstUsr */{1497,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_FormSocialPostUsr ,NULL},
/* ActRcvSocPstUsr */{1498,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL}, /* ActRcvSocPstUsr */{1498,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveSocialPostUsr ,NULL},
/* ActComSocNotUsr */{1504,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_CommentSocialNoteUsr ,NULL}, /* ActComSocNotUsr */{1504,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ReceiveCommentUsr ,NULL},
/* ActShaSocNotUsr */{1499,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL}, /* ActShaSocNotUsr */{1499,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_ShareSocialNoteUsr ,NULL},
/* ActUnsSocPubUsr */{1500,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubUsr ,NULL}, /* ActUnsSocPubUsr */{1500,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_UnshareSocialPubUsr ,NULL},
/* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubUsr ,NULL}, /* ActReqRemSocPubUsr*/{1501,-1,TabSoc,ActReqPubPrf ,0x1FE,0x1FE,0x1FE,Act_CONTENT_NORM,Act_MAIN_WINDOW,NULL ,Soc_RequestRemSocialPubUsr ,NULL},

4
swad_changelog.h
View File

@ -124,13 +124,15 @@ En definitiva, se estar
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.100.3 (2016-01-07)" #define Log_PLATFORM_VERSION "SWAD 15.100.4 (2016-01-07)"
#define CSS_FILE "swad15.100.2.css" #define CSS_FILE "swad15.100.2.css"
#define JS_FILE "swad15.100.2.js" #define JS_FILE "swad15.100.2.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.100.4: Jan 07, 2016 Fixed bug when sharing a social note.
Receive social comment. (191012 lines)
Version 15.100.3: Jan 07, 2016 Fixed bug when sharing and unsharing a social note. (190999 lines) Version 15.100.3: Jan 07, 2016 Fixed bug when sharing and unsharing a social note. (190999 lines)
Version 15.100.2: Jan 07, 2016 Hidden form to reply a social note. (190983 lines) Version 15.100.2: Jan 07, 2016 Hidden form to reply a social note. (190983 lines)
Version 15.100.1: Jan 07, 2016 New icon in social note to reply. (190937 lines) Version 15.100.1: Jan 07, 2016 New icon in social note to reply. (190937 lines)

57
swad_social.c
View File

@ -160,7 +160,7 @@ static void Soc_PutHiddenParamPubCod (long PubCod);
static long Soc_GetParamNotCod (void); static long Soc_GetParamNotCod (void);
static long Soc_GetParamPubCod (void); static long Soc_GetParamPubCod (void);
static void Soc_CommentSocialNote (void); static void Soc_ReceiveComment (void);
static void Soc_ShareSocialNote (void); static void Soc_ShareSocialNote (void);
static void Soc_UnshareSocialPublishing (void); static void Soc_UnshareSocialPublishing (void);
static void Soc_UnshareASocialPublishingFromDB (struct SocialNote *SocNot); static void Soc_UnshareASocialPublishingFromDB (struct SocialNote *SocNot);
@ -1153,15 +1153,7 @@ static void Soc_PutFormToCommentSocialNote (long NotCod)
{ {
extern const char *Txt_Comment; extern const char *Txt_Comment;
/***** Form to comment a social note *****/ /***** Link to show/hide comment form in a social note *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
{
Act_FormStartAnchor (ActComSocNotUsr,"timeline");
Usr_PutParamOtherUsrCodEncrypted ();
}
else
Act_FormStart (ActComSocNotGbl);
Soc_PutHiddenParamNotCod (NotCod);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT ICON_HIGHLIGHT\">" fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT ICON_HIGHLIGHT\">"
"<input type=\"image\"" "<input type=\"image\""
" src=\"%s/write64x64.gif\"" " src=\"%s/write64x64.gif\""
@ -1175,7 +1167,6 @@ static void Soc_PutFormToCommentSocialNote (long NotCod)
Txt_Comment, Txt_Comment,
Txt_Comment, Txt_Comment,
NotCod); NotCod);
Act_FormEnd ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1200,6 +1191,7 @@ static void Soc_PutHiddenFormToSendCommentToASocialNote (long NotCod)
} }
else else
Act_FormStart (ActComSocNotGbl); Act_FormStart (ActComSocNotGbl);
Soc_PutHiddenParamNotCod (NotCod);
fprintf (Gbl.F.Out,"<textarea name=\"Comment%ld\" cols=\"44\" rows=\"5\">" fprintf (Gbl.F.Out,"<textarea name=\"Comment%ld\" cols=\"44\" rows=\"5\">"
"</textarea>", "</textarea>",
NotCod); NotCod);
@ -1383,16 +1375,16 @@ static long Soc_GetParamPubCod (void)
/*************************** Comment a social note ***************************/ /*************************** Comment a social note ***************************/
/*****************************************************************************/ /*****************************************************************************/
void Soc_CommentSocialNoteGbl (void) void Soc_ReceiveCommentGbl (void)
{ {
/***** Comment social note *****/ /***** Receive comment in a social note *****/
Soc_CommentSocialNote (); Soc_ReceiveComment ();
/***** Write updated timeline after commenting (global) *****/ /***** Write updated timeline after commenting (global) *****/
Soc_ShowTimelineGbl (); Soc_ShowTimelineGbl ();
} }
void Soc_CommentSocialNoteUsr (void) void Soc_ReceiveCommentUsr (void)
{ {
/***** Get user whom profile is displayed *****/ /***** Get user whom profile is displayed *****/
Usr_GetParamOtherUsrCodEncryptedAndGetUsrData (); Usr_GetParamOtherUsrCodEncryptedAndGetUsrData ();
@ -1403,8 +1395,8 @@ void Soc_CommentSocialNoteUsr (void)
/***** Start section *****/ /***** Start section *****/
fprintf (Gbl.F.Out,"<section id=\"timeline\">"); fprintf (Gbl.F.Out,"<section id=\"timeline\">");
/***** Comment social note *****/ /***** Receive comment in a social note *****/
Soc_CommentSocialNote (); Soc_ReceiveComment ();
/***** Write updated timeline after commenting (user) *****/ /***** Write updated timeline after commenting (user) *****/
Soc_ShowTimelineUsr (); Soc_ShowTimelineUsr ();
@ -1413,9 +1405,32 @@ void Soc_CommentSocialNoteUsr (void)
fprintf (Gbl.F.Out,"</section>"); fprintf (Gbl.F.Out,"</section>");
} }
static void Soc_CommentSocialNote (void) static void Soc_ReceiveComment (void)
{ {
Lay_ShowAlert (Lay_WARNING,"Not implemented."); char Content[Cns_MAX_BYTES_LONG_TEXT+1];
// char Query[128+Cns_MAX_BYTES_LONG_TEXT];
struct SocialNote SocNot;
char ParamName[32];
// long ComCod;
/***** Get and store new comment *****/
/* Get the code of the social note */
SocNot.NotCod = Soc_GetParamNotCod ();
/* Get the content of the comment */
sprintf (ParamName,"Comment%ld",SocNot.NotCod);
Par_GetParAndChangeFormat (ParamName,Content,Cns_MAX_BYTES_LONG_TEXT,
Str_TO_RIGOROUS_HTML,true);
/* Insert post content in the database */
/*
sprintf (Query,"INSERT INTO social_comments (SocNot,UsrCod,Content,TimeComment)"
" VALUES ('%ld','%s',NOW())",
SocNot.NotCod,Content);
ComCod = DB_QueryINSERTandReturnCode (Query,"can not create comment");
*/
Lay_ShowAlert (Lay_INFO,Content);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1461,8 +1476,8 @@ static void Soc_ShareSocialNote (void)
bool IAmAPublisherOfThisSocNot; bool IAmAPublisherOfThisSocNot;
bool ICanShare; bool ICanShare;
/***** Get the code of the social publishing to unshare *****/ /***** Get the code of the social note to share *****/
SocPub.NotCod = Soc_GetParamNotCod (); SocNot.NotCod = Soc_GetParamNotCod ();
/***** Get data of social note *****/ /***** Get data of social note *****/
Soc_GetDataOfSocialNoteByCod (&SocNot); Soc_GetDataOfSocialNoteByCod (&SocNot);

4
swad_social.h
View File

@ -95,8 +95,8 @@ void Soc_FormSocialPostUsr (void);
void Soc_ReceiveSocialPostGbl (void); void Soc_ReceiveSocialPostGbl (void);
void Soc_ReceiveSocialPostUsr (void); void Soc_ReceiveSocialPostUsr (void);
void Soc_CommentSocialNoteGbl (void); void Soc_ReceiveCommentGbl (void);
void Soc_CommentSocialNoteUsr (void); void Soc_ReceiveCommentUsr (void);
void Soc_ShareSocialNoteGbl (void); void Soc_ShareSocialNoteGbl (void);
void Soc_ShareSocialNoteUsr (void); void Soc_ShareSocialNoteUsr (void);