From 15199d7129a002f275bc21f8c0e1ab672db31127 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 26 Jan 2016 01:12:28 +0100 Subject: [PATCH] Version 15.130 --- sql/cambios.sql | 50 ++++++++++++++++++++++++++++++++++++++++++ swad_changelog.h | 27 ++++++++++++++++++++++- swad_notification.c | 15 ------------- swad_notification.h | 23 ++++++++++---------- swad_social.c | 6 ----- swad_text.c | 53 --------------------------------------------- 6 files changed, 87 insertions(+), 87 deletions(-) diff --git a/sql/cambios.sql b/sql/cambios.sql index 510421237..82f689cc1 100644 --- a/sql/cambios.sql +++ b/sql/cambios.sql @@ -11342,3 +11342,53 @@ UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x3E00); UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x3E00); + +----- SWAD 15.130 (2016/01/26) ----- + + + 0 ---> unchanged +... + 8 ---> unchanged + + 10 ---> 9 + 11 ---> 10 + + 19 ---> 18 + +UPDATE notif SET NotifyEvent= 9 WHERE NotifyEvent=10; +UPDATE notif SET NotifyEvent=10 WHERE NotifyEvent=11; +UPDATE notif SET NotifyEvent=11 WHERE NotifyEvent=12; +UPDATE notif SET NotifyEvent=12 WHERE NotifyEvent=13; +UPDATE notif SET NotifyEvent=13 WHERE NotifyEvent=14; +UPDATE notif SET NotifyEvent=14 WHERE NotifyEvent=15; +UPDATE notif SET NotifyEvent=15 WHERE NotifyEvent=16; +UPDATE notif SET NotifyEvent=16 WHERE NotifyEvent=17; +UPDATE notif SET NotifyEvent=17 WHERE NotifyEvent=18; +UPDATE notif SET NotifyEvent=18 WHERE NotifyEvent=19; + +UPDATE sta_notif SET NotifyEvent= 9 WHERE NotifyEvent=10; +UPDATE sta_notif SET NotifyEvent=10 WHERE NotifyEvent=11; +UPDATE sta_notif SET NotifyEvent=11 WHERE NotifyEvent=12; +UPDATE sta_notif SET NotifyEvent=12 WHERE NotifyEvent=13; +UPDATE sta_notif SET NotifyEvent=13 WHERE NotifyEvent=14; +UPDATE sta_notif SET NotifyEvent=14 WHERE NotifyEvent=15; +UPDATE sta_notif SET NotifyEvent=15 WHERE NotifyEvent=16; +UPDATE sta_notif SET NotifyEvent=16 WHERE NotifyEvent=17; +UPDATE sta_notif SET NotifyEvent=17 WHERE NotifyEvent=18; +UPDATE sta_notif SET NotifyEvent=18 WHERE NotifyEvent=19; + + 9 ---> 17 +19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0 + a b c d | e f g h | i j k x | x x x x | x x x x + | F F | C 0 0 + |__ |__ + | | + | | + v v +19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0 + x a b c | d e f g | h i j x | x x x x | x x x x + +UPDATE usr_data SET NotifNtfEvents = ((NotifNtfEvents & ~0x7FE00) | ((NotifNtfEvents & 0xFFC00) >> 1)); +UPDATE usr_data SET EmailNtfEvents = ((EmailNtfEvents & ~0xFFE00) | ((EmailNtfEvents & 0xFFC00) >> 1)); + + diff --git a/swad_changelog.h b/swad_changelog.h index 64e0895e2..be5cd438e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -121,13 +121,38 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.129.3 (2016-01-25)" +#define Log_PLATFORM_VERSION "SWAD 15.130 (2016-01-26)" #define CSS_FILE "swad15.121.7.css" #define JS_FILE "swad15.121.7.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.130: Jan 26, 2016 Do not notify new social notes. (194914 lines) + 22 changes necessary in database: +UPDATE notif SET NotifyEvent= 9 WHERE NotifyEvent=10; +UPDATE notif SET NotifyEvent=10 WHERE NotifyEvent=11; +UPDATE notif SET NotifyEvent=11 WHERE NotifyEvent=12; +UPDATE notif SET NotifyEvent=12 WHERE NotifyEvent=13; +UPDATE notif SET NotifyEvent=13 WHERE NotifyEvent=14; +UPDATE notif SET NotifyEvent=14 WHERE NotifyEvent=15; +UPDATE notif SET NotifyEvent=15 WHERE NotifyEvent=16; +UPDATE notif SET NotifyEvent=16 WHERE NotifyEvent=17; +UPDATE notif SET NotifyEvent=17 WHERE NotifyEvent=18; +UPDATE notif SET NotifyEvent=18 WHERE NotifyEvent=19; +UPDATE sta_notif SET NotifyEvent= 9 WHERE NotifyEvent=10; +UPDATE sta_notif SET NotifyEvent=10 WHERE NotifyEvent=11; +UPDATE sta_notif SET NotifyEvent=11 WHERE NotifyEvent=12; +UPDATE sta_notif SET NotifyEvent=12 WHERE NotifyEvent=13; +UPDATE sta_notif SET NotifyEvent=13 WHERE NotifyEvent=14; +UPDATE sta_notif SET NotifyEvent=14 WHERE NotifyEvent=15; +UPDATE sta_notif SET NotifyEvent=15 WHERE NotifyEvent=16; +UPDATE sta_notif SET NotifyEvent=16 WHERE NotifyEvent=17; +UPDATE sta_notif SET NotifyEvent=17 WHERE NotifyEvent=18; +UPDATE sta_notif SET NotifyEvent=18 WHERE NotifyEvent=19; +UPDATE usr_data SET NotifNtfEvents = ((NotifNtfEvents & ~0x7FE00) | ((NotifNtfEvents & 0xFFC00) >> 1)); +UPDATE usr_data SET EmailNtfEvents = ((EmailNtfEvents & ~0xFFE00) | ((EmailNtfEvents & 0xFFC00) >> 1)); + Version 15.129.3: Jan 25, 2016 Changed text in some messages. (194964 lines) Version 15.129.2: Jan 25, 2016 Mark timeline notifications as seen when new social activity is shown. (194967 lines) Version 15.129.1: Jan 25, 2016 Do not show top message in social timeline for original publishings. (194979 lines) diff --git a/swad_notification.c b/swad_notification.c index 437eaea9e..9a4745dd1 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -74,7 +74,6 @@ const char *Ntf_WSNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = "enrollmentRequest", // Ntf_EVENT_ENROLLMENT_REQUEST /* Social tab */ - "timelinePublish", // Ntf_EVENT_TIMELINE_PUBLISH "timelineComment", // Ntf_EVENT_TIMELINE_COMMENT "timelineFav", // Ntf_EVENT_TIMELINE_FAV "timelineShare", // Ntf_EVENT_TIMELINE_SHARE @@ -112,7 +111,6 @@ static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] = ActSeeSignUpReq, // Ntf_EVENT_ENROLLMENT_REQUEST /* Social tab */ - ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_PUBLISH ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_COMMENT ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_FAV ActSeeSocTmlGbl, // Ntf_EVENT_TIMELINE_SHARE @@ -155,7 +153,6 @@ static const char *Ntf_ParamNotifMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = "NotifyNtfEventEnrollmentRequest", // Ntf_EVENT_ENROLLMENT_REQUEST /* Social tab */ - "NotifyNtfEventTimelinePublish", // Ntf_EVENT_TIMELINE_PUBLISH "NotifyNtfEventTimelineComment", // Ntf_EVENT_TIMELINE_COMMENT "NotifyNtfEventTimelineFav", // Ntf_EVENT_TIMELINE_FAV "NotifyNtfEventTimelineShare", // Ntf_EVENT_TIMELINE_SHARE @@ -194,7 +191,6 @@ static const char *Ntf_ParamEmailMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] = "EmailNtfEventEnrollmentRequest", // Ntf_EVENT_ENROLLMENT_REQUEST /* Social tab */ - "EmailNtfEventTimelinePublish", // Ntf_EVENT_TIMELINE_PUBLISH "EmailNtfEventTimelineComment", // Ntf_EVENT_TIMELINE_COMMENT "EmailNtfEventTimelineFav", // Ntf_EVENT_TIMELINE_FAV "EmailNtfEventTimelineShare", // Ntf_EVENT_TIMELINE_SHARE @@ -233,7 +229,6 @@ static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] = "enrollmentrequest16x16.gif", // Ntf_EVENT_ENROLLMENT_REQUEST /* Social tab */ - "soc64x64.png", // Ntf_EVENT_TIMELINE_PUBLISH "soc64x64.png", // Ntf_EVENT_TIMELINE_COMMENT "fav64x64.png", // Ntf_EVENT_TIMELINE_FAV "share64x64.png", // Ntf_EVENT_TIMELINE_SHARE @@ -727,7 +722,6 @@ static bool Ntf_StartFormGoToAction (Ntf_NotifyEvent_t NotifyEvent, Brw_PutHiddenParamFilCod (FileMetadata.FilCod); } break; - case Ntf_EVENT_TIMELINE_PUBLISH: case Ntf_EVENT_TIMELINE_COMMENT: case Ntf_EVENT_TIMELINE_FAV: case Ntf_EVENT_TIMELINE_SHARE: @@ -879,7 +873,6 @@ void Ntf_GetNotifSummaryAndContent (char *SummaryStr,char **ContentStr, case Ntf_EVENT_ENROLLMENT_REQUEST: Enr_GetNotifEnrollmentRequest (SummaryStr,ContentStr,Cod,MaxChars,GetContent); break; - case Ntf_EVENT_TIMELINE_PUBLISH: case Ntf_EVENT_TIMELINE_COMMENT: case Ntf_EVENT_TIMELINE_FAV: case Ntf_EVENT_TIMELINE_SHARE: @@ -1235,13 +1228,6 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod) Gbl.CurrentDeg.Deg.DegCod, Gbl.Usrs.Me.UsrDat.UsrCod); break; - case Ntf_EVENT_TIMELINE_PUBLISH: // New social publishing (original, no comment or sharing) from one of the users I follow - // Cod is the code of the social publishing (not used in the following query) - // Get all my followers - sprintf (Query,"SELECT FollowerCod FROM usr_follow" - " WHERE FollowedCod='%ld'", - Gbl.Usrs.Me.UsrDat.UsrCod); - break; case Ntf_EVENT_TIMELINE_COMMENT: // New comment to one of my social notes or comments // Cod is the code of the social publishing sprintf (Query,"SELECT DISTINCT(PublisherCod) FROM social_pubs" @@ -1600,7 +1586,6 @@ static void Ntf_SendPendingNotifByEMailToOneUsr (struct UsrData *ToUsrDat,unsign switch (NotifyEvent) { case Ntf_EVENT_UNKNOWN: - case Ntf_EVENT_TIMELINE_PUBLISH: case Ntf_EVENT_TIMELINE_COMMENT: case Ntf_EVENT_TIMELINE_FAV: case Ntf_EVENT_TIMELINE_SHARE: diff --git a/swad_notification.h b/swad_notification.h index 802d33f16..4eee0af91 100644 --- a/swad_notification.h +++ b/swad_notification.h @@ -37,7 +37,7 @@ /******************************** Public types *******************************/ /*****************************************************************************/ -#define Ntf_NUM_NOTIFY_EVENTS (1+19) +#define Ntf_NUM_NOTIFY_EVENTS (1+18) // If the numbers assigned to each event type change, // it is necessary to change old numbers to new ones in database tables notif and sta_notif typedef enum @@ -59,21 +59,20 @@ typedef enum Ntf_EVENT_ENROLLMENT_REQUEST = 8, /* Social tab */ - Ntf_EVENT_TIMELINE_PUBLISH = 9, // New social publishing (post or comment) from one of the users I follow - Ntf_EVENT_TIMELINE_COMMENT = 10, // New comment to one of my social publishings (notes or comments) - Ntf_EVENT_TIMELINE_FAV = 11, // New fav of one of my social publishings (notes or comments) - Ntf_EVENT_TIMELINE_SHARE = 12, // New sharing of one of my social notes - Ntf_EVENT_TIMELINE_MENTION = 13, // New mention (reserved for future use) - Ntf_EVENT_FOLLOWER = 14, - Ntf_EVENT_FORUM_POST_COURSE = 15, // New post in forums of my courses - Ntf_EVENT_FORUM_REPLY = 16, // New reply to one of my posts in any forum + Ntf_EVENT_TIMELINE_COMMENT = 9, // Old 10 // New comment to one of my social publishings (notes or comments) + Ntf_EVENT_TIMELINE_FAV = 10, // Old 11 // New fav of one of my social publishings (notes or comments) + Ntf_EVENT_TIMELINE_SHARE = 11, // Old 12 // New sharing of one of my social notes + Ntf_EVENT_TIMELINE_MENTION = 12, // Old 13 // New mention + Ntf_EVENT_FOLLOWER = 13, // Old 14 + Ntf_EVENT_FORUM_POST_COURSE = 14, // Old 15 // New post in forums of my courses + Ntf_EVENT_FORUM_REPLY = 15, // Old 16 // New reply to one of my posts in any forum /* Messages tab */ - Ntf_EVENT_NOTICE = 17, - Ntf_EVENT_MESSAGE = 18, + Ntf_EVENT_NOTICE = 16, // Old 17 + Ntf_EVENT_MESSAGE = 17, // Old 18 /* Statistics tab */ - Ntf_EVENT_SURVEY = 19, + Ntf_EVENT_SURVEY = 18, // Old 19 /* Profile tab */ diff --git a/swad_social.c b/swad_social.c index 0dca0d826..4bc85f956 100644 --- a/swad_social.c +++ b/swad_social.c @@ -278,7 +278,6 @@ void Soc_ShowTimelineGbl (void) Soc_TOP_MESSAGE_NONE, // Ntf_EVENT_ENROLLMENT_REQUEST /* Social tab */ - Soc_TOP_MESSAGE_NONE, // Ntf_EVENT_TIMELINE_PUBLISH Soc_TOP_MESSAGE_COMMENTED, // Ntf_EVENT_TIMELINE_COMMENT Soc_TOP_MESSAGE_FAVED, // Ntf_EVENT_TIMELINE_FAV Soc_TOP_MESSAGE_SHARED, // Ntf_EVENT_TIMELINE_SHARE @@ -461,7 +460,6 @@ static void Soc_GetAndShowOldTimeline (Soc_TimelineUsrOrGbl_t TimelineUsrOrGbl) void Soc_MarkMyNotifAsSeen (void) { - Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_PUBLISH,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod); Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_COMMENT,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod); Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_FAV ,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod); Ntf_MarkNotifAsSeen (Ntf_EVENT_TIMELINE_SHARE ,-1L,-1L,Gbl.Usrs.Me.UsrDat.UsrCod); @@ -2048,9 +2046,6 @@ static long Soc_ReceiveSocialPost (void) /* Insert post in social notes */ Soc_StoreAndPublishSocialNote (Soc_NOTE_SOCIAL_POST,PstCod,&SocPub); - /***** Store notifications about the new publishing *****/ - Ntf_StoreNotifyEventsToAllUsrs (Ntf_EVENT_TIMELINE_PUBLISH,SocPub.PubCod); - /***** Analyze content and store notifications about mentions *****/ Str_AnalyzeTxtAndStoreNotifyEventToMentionedUsrs (SocPub.PubCod,Content); } @@ -3473,7 +3468,6 @@ static void Soc_RemoveASocialNoteFromDB (struct SocialNote *SocNot) PubCod = Soc_GetPubCodOfOriginalSocialNote (SocNot->NotCod); if (PubCod > 0) { - Ntf_MarkNotifAsRemoved (Ntf_EVENT_TIMELINE_PUBLISH,PubCod); Ntf_MarkNotifAsRemoved (Ntf_EVENT_TIMELINE_COMMENT,PubCod); Ntf_MarkNotifAsRemoved (Ntf_EVENT_TIMELINE_FAV ,PubCod); Ntf_MarkNotifAsRemoved (Ntf_EVENT_TIMELINE_SHARE ,PubCod); diff --git a/swad_text.c b/swad_text.c index e2d7813ff..7fad36057 100644 --- a/swad_text.c +++ b/swad_text.c @@ -662,19 +662,6 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_ "Novo pedido de inscrição", }, { - // Ntf_EVENT_TIMELINE_PUBLISH - "", - "Novo missatge social", - "Neue soziale Beitrag", - "New social post", - "Nuevo mensaje social", - "Nouveau message social", - "Nuevo mensaje social", // Okoteve traducción - "Nuovo post sociale", - "Nowy post spoleczna", - "Novo post sociais", - }, - { // Ntf_EVENT_TIMELINE_COMMENT "", "Nou comentari a un missatge social", @@ -25134,26 +25121,6 @@ const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS] = "Novos pedidos de inscrição" #endif , -#if L==1 // Ntf_EVENT_TIMELINE_PUBLISH - "Nous missatges socials" -#elif L==2 - "Neue sozialen Beiträge" -#elif L==3 - "New social posts" -#elif L==4 - "Nuevos mensajes sociales" -#elif L==5 - "Nouveaux messages sociaux" -#elif L==6 - "Nuevos mensajes sociales" // Okoteve traducción -#elif L==7 - "Nuovi post sociali" -#elif L==8 - "Nowe post społeczne" -#elif L==9 - "Novos post sociais" -#endif - , #if L==1 // Ntf_EVENT_TIMELINE_COMMENT "Nous comentaris als meus missatges socials" #elif L==2 @@ -25537,26 +25504,6 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR[Ntf_NUM_NOTIFY_EVENTS] = "Pedido de inscrição" #endif , -#if L==1 // Ntf_EVENT_TIMELINE_PUBLISH - "Missatge social" -#elif L==2 - "Soziale Beitrag" -#elif L==3 - "Social post" -#elif L==4 - "Mensaje social" -#elif L==5 - "Message social" -#elif L==6 - "Mensaje social" // Okoteve traducción -#elif L==7 - "Post sociale" -#elif L==8 - "Post społeczna" -#elif L==9 - "Post sociais" -#endif - , #if L==1 // Ntf_EVENT_TIMELINE_COMMENT "Comentari a un missatge social" #elif L==2