mirror of https://github.com/acanas/swad-core.git
Version 15.123
This commit is contained in:
Antonio Cañas Vargas
parent
c099b63cb5
commit
1998792af0
120
sql/cambios.sql
120
sql/cambios.sql
|
|
@ -11246,3 +11246,123 @@ END;
|
|||
|
|
||||
DELIMITER ;
|
||||
CALL get_note_cods();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
----- SWAD 15.123 (2016/01/21) -----
|
||||
0 ---> unchanged
|
||||
...
|
||||
8 ---> unchanged
|
||||
|
||||
9 ---> new
|
||||
...
|
||||
12 ---> new
|
||||
|
||||
13 ---> 18
|
||||
12 ---> 17
|
||||
9 ---> 16
|
||||
11 ---> 15
|
||||
14 ---> 13
|
||||
10 ---> 14
|
||||
|
||||
UPDATE notif SET NotifyEvent=18 WHERE NotifyEvent=13;
|
||||
UPDATE notif SET NotifyEvent=17 WHERE NotifyEvent=12;
|
||||
UPDATE notif SET NotifyEvent=16 WHERE NotifyEvent=9;
|
||||
UPDATE notif SET NotifyEvent=15 WHERE NotifyEvent=11;
|
||||
UPDATE notif SET NotifyEvent=13 WHERE NotifyEvent=14;
|
||||
UPDATE notif SET NotifyEvent=14 WHERE NotifyEvent=10;
|
||||
|
||||
UPDATE sta_notif SET NotifyEvent=18 WHERE NotifyEvent=13;
|
||||
UPDATE sta_notif SET NotifyEvent=17 WHERE NotifyEvent=12;
|
||||
UPDATE sta_notif SET NotifyEvent=16 WHERE NotifyEvent=9;
|
||||
UPDATE sta_notif SET NotifyEvent=15 WHERE NotifyEvent=11;
|
||||
UPDATE sta_notif SET NotifyEvent=13 WHERE NotifyEvent=14;
|
||||
UPDATE sta_notif SET NotifyEvent=14 WHERE NotifyEvent=10;
|
||||
|
||||
13 ---> 18
|
||||
12 ---> 17
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 0 0 0 | 0 x a b | x x x x | x x x x | x x x x
|
||||
0 3 0 0 0
|
||||
| |
|
||||
_______________| |
|
||||
| _______________|
|
||||
| |
|
||||
v v
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b 0 | 0 x 0 0 | x x x x | x x x x | x x x x
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x3000) << 5));
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x3000);
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x3000) << 5));
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x3000);
|
||||
|
||||
9 ---> 16
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b 0 | 0 x 0 0 | x x c x | x x x x | x x x x
|
||||
0 0 2 0 0
|
||||
______________________|
|
||||
|
|
||||
v
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b c | 0 x 0 0 | x x 0 x | x x x x | x x x x
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x200) << 7));
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x200);
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x200) << 7));
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x200);
|
||||
|
||||
11 ---> 15
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b c | 0 x 0 0 | d x 0 x | x x x x | x x x x
|
||||
0 0 8 0 0
|
||||
____________|
|
||||
|
|
||||
v
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b c | d x 0 0 | 0 x 0 x | x x x x | x x x x
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x800) << 4));
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x800);
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x800) << 4));
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x800);
|
||||
|
||||
14 ---> 13
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b c | d e 0 0 | 0 x 0 x | x x x x | x x x x
|
||||
0 4 0 0 0
|
||||
|__
|
||||
|
|
||||
v
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b c | d 0 e 0 | 0 x 0 x | x x x x | x x x x
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x4000) << 4));
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x4000);
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x4000) << 4));
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x4000);
|
||||
|
||||
10 ---> 14
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b c | d 0 e 0 | 0 f 0 x | x x x x | x x x x
|
||||
0 0 4 0 0
|
||||
____________|
|
||||
|
|
||||
v
|
||||
19 18 17 16 |15 14 13 12 |11 10 9 8 | 7 6 5 4 | 3 2 1 0
|
||||
0 a b c | d f e 0 | 0 0 0 x | x x x x | x x x x
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | ((NotifNtfEvents & 0x400) << 4));
|
||||
UPDATE usr_data SET NotifNtfEvents = (NotifNtfEvents | 0x400);
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents | ((EmailNtfEvents & 0x400) << 4));
|
||||
UPDATE usr_data SET EmailNtfEvents = (EmailNtfEvents & ~0x400);
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -121,13 +121,14 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.122.1 (2016-01-20)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 15.123 (2016-01-22)"
|
||||
#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.123: Jan 22, 2016 New social notifications. Not finished. (194277 lines)
|
||||
Version 15.122.1: Jan 20, 2016 Changes in table of actions. (194018 lines)
|
||||
8 changes necessary in database:
|
||||
INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1512','es','N','Marcar post social como favorito (global)');
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@
|
|||
/** Uncomment one of the following installations of SWAD or create your own **/
|
||||
/*****************************************************************************/
|
||||
|
||||
//#define LOCALHOST_UBUNTU // Comment this line if not applicable
|
||||
#define LOCALHOST_UBUNTU // Comment this line if not applicable
|
||||
//#define OPENSWAD_ORG // Comment this line if not applicable
|
||||
#define SWAD_UGR_ES // Comment this line if not applicable
|
||||
//#define SWAD_UGR_ES // Comment this line if not applicable
|
||||
//#define WWW_CEVUNA_UNA_PY // Comment this line if not applicable
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
|||
|
|
@ -57,33 +57,39 @@ extern struct Globals Gbl;
|
|||
|
||||
const char *Ntf_WSNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] =
|
||||
{
|
||||
"unknown",
|
||||
"unknown", // Ntf_EVENT_UNKNOWN
|
||||
|
||||
/* Course tab */
|
||||
"documentFile",
|
||||
"sharedFile",
|
||||
"documentFile", // Ntf_EVENT_DOCUMENT_FILE
|
||||
"sharedFile", // Ntf_EVENT_SHARED_FILE
|
||||
|
||||
/* Assessment tab */
|
||||
"assignment",
|
||||
"examAnnouncement",
|
||||
"marksFile",
|
||||
"assignment", // Ntf_EVENT_ASSIGNMENT
|
||||
"examAnnouncement", // Ntf_EVENT_EXAM_ANNOUNCEMENT
|
||||
"marksFile", // Ntf_EVENT_MARKS_FILE
|
||||
|
||||
/* Enrollment tab */
|
||||
"enrollmentStudent",
|
||||
"enrollmentTeacher",
|
||||
"enrollmentRequest",
|
||||
/* Users tab */
|
||||
"enrollmentStudent", // Ntf_EVENT_ENROLLMENT_STUDENT
|
||||
"enrollmentTeacher", // Ntf_EVENT_ENROLLMENT_TEACHER
|
||||
"enrollmentRequest", // Ntf_EVENT_ENROLLMENT_REQUEST
|
||||
|
||||
/* Social tab */
|
||||
"socialPost", // Ntf_EVENT_SOCIAL_POST
|
||||
"socialComment", // Ntf_EVENT_SOCIAL_COMMENT
|
||||
"socialFav", // Ntf_EVENT_SOCIAL_FAV
|
||||
"socialShare", // Ntf_EVENT_SOCIAL_SHARE
|
||||
"follower", // Ntf_EVENT_FOLLOWER
|
||||
"forumPostCourse", // Ntf_EVENT_FORUM_POST_COURSE
|
||||
"forumReply", // Ntf_EVENT_FORUM_REPLY
|
||||
|
||||
/* Messages tab */
|
||||
"notice",
|
||||
"forumPostCourse",
|
||||
"forumReply",
|
||||
"message",
|
||||
"notice", // Ntf_EVENT_NOTICE
|
||||
"message", // Ntf_EVENT_MESSAGE
|
||||
|
||||
/* Statistics tab */
|
||||
"survey",
|
||||
"survey", // Ntf_EVENT_SURVEY
|
||||
|
||||
/* Profile tab */
|
||||
"follower",
|
||||
};
|
||||
|
||||
static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] =
|
||||
|
|
@ -105,21 +111,22 @@ static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
ActSeeSignUpReq, // Ntf_EVENT_ENROLLMENT_REQUEST
|
||||
|
||||
/* Social tab */
|
||||
// Ntf_EVENT_FOLLOWER
|
||||
// Ntf_EVENT_FORUM_POST_COURSE
|
||||
// Ntf_EVENT_FORUM_REPLY
|
||||
ActSeeSocTmlGbl, // Ntf_EVENT_SOCIAL_POST
|
||||
ActSeeSocTmlGbl, // Ntf_EVENT_SOCIAL_COMMENT
|
||||
ActSeeSocTmlGbl, // Ntf_EVENT_SOCIAL_FAV
|
||||
ActSeeSocTmlGbl, // Ntf_EVENT_SOCIAL_SHARE
|
||||
ActSeeFlr, // Ntf_EVENT_FOLLOWER
|
||||
ActSeeFor, // Ntf_EVENT_FORUM_POST_COURSE
|
||||
ActSeeFor, // Ntf_EVENT_FORUM_REPLY
|
||||
|
||||
/* Messages tab */
|
||||
ActShoNot, // Ntf_EVENT_NOTICE
|
||||
ActSeeFor, // Ntf_EVENT_FORUM_POST_COURSE TODO: Move to social tab
|
||||
ActSeeFor, // Ntf_EVENT_FORUM_REPLY TODO: Move to social tab
|
||||
ActExpRcvMsg, // Ntf_EVENT_MESSAGE
|
||||
|
||||
/* Statistics tab */
|
||||
ActSeeAllSvy, // Ntf_EVENT_SURVEY
|
||||
|
||||
/* Profile tab */
|
||||
ActSeeFlr, // Ntf_EVENT_FOLLOWER TODO: Move to social tab
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -129,65 +136,77 @@ static const Act_Action_t Ntf_DefaultActions[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
// Notify me notification events
|
||||
static const char *Ntf_ParamNotifMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] =
|
||||
{
|
||||
"NotifyNtfEventUnknown",
|
||||
"NotifyNtfEventUnknown", // Ntf_EVENT_UNKNOWN
|
||||
|
||||
/* Course tab */
|
||||
"NotifyNtfEventDocumentFile",
|
||||
"NotifyNtfEventSharedFile",
|
||||
"NotifyNtfEventDocumentFile", // Ntf_EVENT_DOCUMENT_FILE
|
||||
"NotifyNtfEventSharedFile", // Ntf_EVENT_SHARED_FILE
|
||||
|
||||
/* Assessment tab */
|
||||
"NotifyNtfEventAssignment",
|
||||
"NotifyNtfEventExamAnnouncement",
|
||||
"NotifyNtfEventMarksFile",
|
||||
"NotifyNtfEventAssignment", // Ntf_EVENT_ASSIGNMENT
|
||||
"NotifyNtfEventExamAnnouncement", // Ntf_EVENT_EXAM_ANNOUNCEMENT
|
||||
"NotifyNtfEventMarksFile", // Ntf_EVENT_MARKS_FILE
|
||||
|
||||
/* Enrollment tab */
|
||||
"NotifyNtfEventEnrollmentStudent",
|
||||
"NotifyNtfEventEnrollmentTeacher",
|
||||
"NotifyNtfEventEnrollmentRequest",
|
||||
/* Users tab */
|
||||
"NotifyNtfEventEnrollmentStudent", // Ntf_EVENT_ENROLLMENT_STUDENT
|
||||
"NotifyNtfEventEnrollmentTeacher", // Ntf_EVENT_ENROLLMENT_TEACHER
|
||||
"NotifyNtfEventEnrollmentRequest", // Ntf_EVENT_ENROLLMENT_REQUEST
|
||||
|
||||
/* Social tab */
|
||||
"NotifyNtfEventSocialPost", // Ntf_EVENT_SOCIAL_POST
|
||||
"NotifyNtfEventSocialComment", // Ntf_EVENT_SOCIAL_COMMENT
|
||||
"NotifyNtfEventSocialFav", // Ntf_EVENT_SOCIAL_FAV
|
||||
"NotifyNtfEventSocialShare", // Ntf_EVENT_SOCIAL_SHARE
|
||||
"NotifyNtfEventFollower", // Ntf_EVENT_FOLLOWER
|
||||
"NotifyNtfEventForumPostCourse", // Ntf_EVENT_FORUM_POST_COURSE
|
||||
"NotifyNtfEventForumReply", // Ntf_EVENT_FORUM_REPLY
|
||||
|
||||
/* Messages tab */
|
||||
"NotifyNtfEventNotice",
|
||||
"NotifyNtfEventForumPostCourse",
|
||||
"NotifyNtfEventForumReply",
|
||||
"NotifyNtfEventMessage",
|
||||
"NotifyNtfEventNotice", // Ntf_EVENT_NOTICE
|
||||
"NotifyNtfEventMessage", // Ntf_EVENT_MESSAGE
|
||||
|
||||
/* Statistics tab */
|
||||
"NotifyNtfEventSurvey",
|
||||
"NotifyNtfEventSurvey", // Ntf_EVENT_SURVEY
|
||||
|
||||
/* Profile tab */
|
||||
"NotifyNtfEventFollower",
|
||||
};
|
||||
|
||||
// Email me about notification events
|
||||
static const char *Ntf_ParamEmailMeAboutNotifyEvents[Ntf_NUM_NOTIFY_EVENTS] =
|
||||
{
|
||||
"EmailNtfEventUnknown",
|
||||
"EmailNtfEventUnknown", // Ntf_EVENT_UNKNOWN
|
||||
|
||||
/* Course tab */
|
||||
"EmailNtfEventDocumentFile",
|
||||
"EmailNtfEventSharedFile",
|
||||
"EmailNtfEventDocumentFile", // Ntf_EVENT_DOCUMENT_FILE
|
||||
"EmailNtfEventSharedFile", // Ntf_EVENT_SHARED_FILE
|
||||
|
||||
/* Assessment tab */
|
||||
"EmailNtfEventAssignment",
|
||||
"EmailNtfEventExamAnnouncement",
|
||||
"EmailNtfEventMarksFile",
|
||||
"EmailNtfEventAssignment", // Ntf_EVENT_ASSIGNMENT
|
||||
"EmailNtfEventExamAnnouncement", // Ntf_EVENT_EXAM_ANNOUNCEMENT
|
||||
"EmailNtfEventMarksFile", // Ntf_EVENT_MARKS_FILE
|
||||
|
||||
/* Enrollment tab */
|
||||
"EmailNtfEventEnrollmentStudent",
|
||||
"EmailNtfEventEnrollmentTeacher",
|
||||
"EmailNtfEventEnrollmentRequest",
|
||||
/* Users tab */
|
||||
"EmailNtfEventEnrollmentStudent", // Ntf_EVENT_ENROLLMENT_STUDENT
|
||||
"EmailNtfEventEnrollmentTeacher", // Ntf_EVENT_ENROLLMENT_TEACHER
|
||||
"EmailNtfEventEnrollmentRequest", // Ntf_EVENT_ENROLLMENT_REQUEST
|
||||
|
||||
/* Social tab */
|
||||
"EmailNtfEventSocialPost", // Ntf_EVENT_SOCIAL_POST
|
||||
"EmailNtfEventSocialComment", // Ntf_EVENT_SOCIAL_COMMENT
|
||||
"EmailNtfEventSocialFav", // Ntf_EVENT_SOCIAL_FAV
|
||||
"EmailNtfEventSocialShare", // Ntf_EVENT_SOCIAL_SHARE
|
||||
"EmailNtfEventFollower", // Ntf_EVENT_FOLLOWER
|
||||
"EmailNtfEventForumPostCourse", // Ntf_EVENT_FORUM_POST_COURSE
|
||||
"EmailNtfEventForumReply", // Ntf_EVENT_FORUM_REPLY
|
||||
|
||||
/* Messages tab */
|
||||
"EmailNtfEventNotice",
|
||||
"EmailNtfEventForumPostCourse",
|
||||
"EmailNtfEventForumReply",
|
||||
"EmailNtfEventMessage",
|
||||
"EmailNtfEventNotice", // Ntf_EVENT_NOTICE
|
||||
"EmailNtfEventMessage", // Ntf_EVENT_MESSAGE
|
||||
|
||||
/* Statistics tab */
|
||||
"EmailNtfEventSurvey",
|
||||
"EmailNtfEventSurvey", // Ntf_EVENT_SURVEY
|
||||
|
||||
/* Profile tab */
|
||||
"EmailNtfEventFollower",
|
||||
};
|
||||
|
||||
// Icons for notification events
|
||||
|
|
@ -204,22 +223,28 @@ static const char *Ntf_Icons[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
"announce16x16.gif", // Ntf_EVENT_EXAM_ANNOUNCEMENT
|
||||
"grades16x16.gif", // Ntf_EVENT_MARKS_FILE
|
||||
|
||||
/* Enrollment tab */
|
||||
/* Users tab */
|
||||
"adduser16x16.gif", // Ntf_EVENT_ENROLLMENT_STUDENT
|
||||
"adduser16x16.gif", // Ntf_EVENT_ENROLLMENT_TEACHER
|
||||
"enrollmentrequest16x16.gif", // Ntf_EVENT_ENROLLMENT_REQUEST
|
||||
|
||||
/* Messages tab */
|
||||
"note16x16.gif", // Ntf_EVENT_NOTICE
|
||||
/* Social tab */
|
||||
"soc64x64.png", // Ntf_EVENT_SOCIAL_POST
|
||||
"soc64x64.png", // Ntf_EVENT_SOCIAL_COMMENT
|
||||
"fav64x64.png", // Ntf_EVENT_SOCIAL_FAV
|
||||
"share64x64.png", // Ntf_EVENT_SOCIAL_SHARE
|
||||
"follow64x64.png", // Ntf_EVENT_FOLLOWER
|
||||
"forum16x16.gif", // Ntf_EVENT_FORUM_POST_COURSE
|
||||
"forum16x16.gif", // Ntf_EVENT_FORUM_REPLY
|
||||
|
||||
/* Messages tab */
|
||||
"note16x16.gif", // Ntf_EVENT_NOTICE
|
||||
"msg64x64.gif", // Ntf_EVENT_MESSAGE
|
||||
|
||||
/* Statistics tab */
|
||||
"survey16x16.gif", // Ntf_EVENT_SURVEY
|
||||
|
||||
/* Profile tab */
|
||||
"follow64x64.png", // Ntf_EVENT_FOLLOWER
|
||||
};
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
@ -805,13 +830,24 @@ void Ntf_GetNotifSummaryAndContent (char *SummaryStr,char **ContentStr,Ntf_Notif
|
|||
case Ntf_EVENT_ENROLLMENT_REQUEST:
|
||||
Enr_GetNotifEnrollmentRequest (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
break;
|
||||
case Ntf_EVENT_NOTICE:
|
||||
Not_GetSummaryAndContentNotice (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
case Ntf_EVENT_SOCIAL_POST:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_COMMENT:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_FAV:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_SHARE:
|
||||
break;
|
||||
case Ntf_EVENT_FOLLOWER:
|
||||
Fol_GetNotifFollower (SummaryStr,ContentStr);
|
||||
break;
|
||||
case Ntf_EVENT_FORUM_POST_COURSE:
|
||||
case Ntf_EVENT_FORUM_REPLY:
|
||||
For_GetSummaryAndContentForumPst (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
break;
|
||||
case Ntf_EVENT_NOTICE:
|
||||
Not_GetSummaryAndContentNotice (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
break;
|
||||
case Ntf_EVENT_MESSAGE:
|
||||
Msg_GetNotifMessage (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
if (Gbl.WebService.IsWebService)
|
||||
|
|
@ -821,9 +857,6 @@ void Ntf_GetNotifSummaryAndContent (char *SummaryStr,char **ContentStr,Ntf_Notif
|
|||
case Ntf_EVENT_SURVEY:
|
||||
Svy_GetNotifSurvey (SummaryStr,ContentStr,Cod,MaxChars,GetContent);
|
||||
break;
|
||||
case Ntf_EVENT_FOLLOWER:
|
||||
Fol_GetNotifFollower (SummaryStr,ContentStr);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1153,6 +1186,16 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
|
|||
Gbl.CurrentDeg.Deg.DegCod,
|
||||
Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_POST:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_COMMENT:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_FAV:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_SHARE:
|
||||
break;
|
||||
case Ntf_EVENT_FOLLOWER: // This function should not be called in this case
|
||||
return 0;
|
||||
case Ntf_EVENT_FORUM_POST_COURSE:
|
||||
// Check if forum is for users or for all users in the course
|
||||
switch (For_GetForumTypeOfAPost (Cod))
|
||||
|
|
@ -1208,8 +1251,6 @@ unsigned Ntf_StoreNotifyEventsToAllUsrs (Ntf_NotifyEvent_t NotifyEvent,long Cod)
|
|||
Cod,Cod,Gbl.Usrs.Me.UsrDat.UsrCod,
|
||||
Cod,Gbl.Usrs.Me.UsrDat.UsrCod);
|
||||
break;
|
||||
case Ntf_EVENT_FOLLOWER: // This function should not be called in this case
|
||||
return 0;
|
||||
}
|
||||
|
||||
if ((NumRows = DB_QuerySELECT (Query,&mysql_res,"can not get users to be notified"))) // Users found
|
||||
|
|
@ -1517,6 +1558,14 @@ static void Ntf_SendPendingNotifByEMailToOneUsr (struct UsrData *ToUsrDat,unsign
|
|||
Txt_Course_NO_HTML[ToUsrLanguage],
|
||||
Crs.FullName);
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_POST:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_COMMENT:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_FAV:
|
||||
break;
|
||||
case Ntf_EVENT_SOCIAL_SHARE:
|
||||
break;
|
||||
case Ntf_EVENT_FORUM_POST_COURSE:
|
||||
case Ntf_EVENT_FORUM_REPLY:
|
||||
For_SetForumName (ForumType,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
/******************************** Public types *******************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Ntf_NUM_NOTIFY_EVENTS 15
|
||||
#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,22 @@ typedef enum
|
|||
Ntf_EVENT_ENROLLMENT_REQUEST = 8,
|
||||
|
||||
/* Social tab */
|
||||
// Ntf_EVENT_FOLLOWER
|
||||
// Ntf_EVENT_FORUM_POST_COURSE
|
||||
// Ntf_EVENT_FORUM_REPLY
|
||||
Ntf_EVENT_SOCIAL_POST = 9,
|
||||
Ntf_EVENT_SOCIAL_COMMENT = 10,
|
||||
Ntf_EVENT_SOCIAL_FAV = 11,
|
||||
Ntf_EVENT_SOCIAL_SHARE = 12,
|
||||
Ntf_EVENT_FOLLOWER = 13, // Old 14
|
||||
Ntf_EVENT_FORUM_POST_COURSE = 14, // Old 10
|
||||
Ntf_EVENT_FORUM_REPLY = 15, // Old 11
|
||||
|
||||
/* Messages tab */
|
||||
Ntf_EVENT_NOTICE = 9,
|
||||
Ntf_EVENT_FORUM_POST_COURSE = 10, // TODO: Move to social tab
|
||||
Ntf_EVENT_FORUM_REPLY = 11, // TODO: Move to social tab
|
||||
Ntf_EVENT_MESSAGE = 12,
|
||||
Ntf_EVENT_NOTICE = 16, // Old 9
|
||||
Ntf_EVENT_MESSAGE = 17, // Old 12
|
||||
|
||||
/* Statistics tab */
|
||||
Ntf_EVENT_SURVEY = 13,
|
||||
Ntf_EVENT_SURVEY = 18, // Old 13
|
||||
|
||||
/* Profile tab */
|
||||
Ntf_EVENT_FOLLOWER = 14, // TODO: Move to social tab
|
||||
|
||||
} Ntf_NotifyEvent_t;
|
||||
|
||||
|
|
|
|||
378
swad_text.c
378
swad_text.c
|
|
@ -662,17 +662,69 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_
|
|||
"Novo pedido de inscrição",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_NOTICE
|
||||
// Ntf_EVENT_SOCIAL_POST
|
||||
"",
|
||||
"Nou avís",
|
||||
"Neuen Ankündigungen",
|
||||
"New notice",
|
||||
"Nuevo aviso",
|
||||
"Nouvel avis",
|
||||
"Nuevo aviso", // Okoteve traducción
|
||||
"Nuovo avviso",
|
||||
"Nowe obwieszczenie",
|
||||
"Novo anúncio",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_SOCIAL_COMMENT
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_SOCIAL_FAV
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_SOCIAL_SHARE
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_FOLLOWER
|
||||
"",
|
||||
"Nou seguidor",
|
||||
"Neue Anhänger",
|
||||
"New follower",
|
||||
"Nuevo seguidor",
|
||||
"Nouveau suiveur",
|
||||
"Nuevo seguidor", // Okoteve traducción
|
||||
"Nuovo follower",
|
||||
"Nowy obserwują",
|
||||
"Novo seguidor",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_FORUM_POST_COURSE
|
||||
|
|
@ -701,6 +753,19 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_
|
|||
"Nova resposta em um fórum",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_NOTICE
|
||||
"",
|
||||
"Nou avís",
|
||||
"Neuen Ankündigungen",
|
||||
"New notice",
|
||||
"Nuevo aviso",
|
||||
"Nouvel avis",
|
||||
"Nuevo aviso", // Okoteve traducción
|
||||
"Nuovo avviso",
|
||||
"Nowe obwieszczenie",
|
||||
"Novo anúncio",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_MESSAGE
|
||||
"",
|
||||
"Nou missatge",
|
||||
|
|
@ -726,19 +791,6 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR_NO_HTML[Ntf_NUM_NOTIFY_EVENTS][1+Txt_NUM_
|
|||
"Nowe badania",
|
||||
"Novo inquérito",
|
||||
},
|
||||
{
|
||||
// Ntf_EVENT_FOLLOWER
|
||||
"",
|
||||
"Nou seguidor",
|
||||
"Neue Anhänger",
|
||||
"New follower",
|
||||
"Nuevo seguidor",
|
||||
"Nouveau suiveur",
|
||||
"Nuevo seguidor", // Okoteve traducción
|
||||
"Nuovo follower",
|
||||
"Nowy obserwują",
|
||||
"Novo seguidor",
|
||||
},
|
||||
};
|
||||
|
||||
const char *Txt_NOTIFY_EVENTS_There_is_a_new_event_NO_HTML[1+Txt_NUM_LANGUAGES] = // Warning: it is very important to include %s in the following sentences
|
||||
|
|
@ -25069,24 +25121,104 @@ const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
"Novos pedidos de inscrição"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_NOTICE
|
||||
"Nous avisos"
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_POST
|
||||
""
|
||||
#elif L==2
|
||||
"Neue Ankündigungen"
|
||||
""
|
||||
#elif L==3
|
||||
"New notices"
|
||||
""
|
||||
#elif L==4
|
||||
"Nuevos avisos"
|
||||
""
|
||||
#elif L==5
|
||||
"Nouveaux avis"
|
||||
""
|
||||
#elif L==6
|
||||
"Nuevos avisos" // Okoteve traducción
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Nuovi avvisi"
|
||||
""
|
||||
#elif L==8
|
||||
"Nowe ogloszenia"
|
||||
""
|
||||
#elif L==9
|
||||
"Novos avisos"
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_COMMENT
|
||||
""
|
||||
#elif L==2
|
||||
""
|
||||
#elif L==3
|
||||
""
|
||||
#elif L==4
|
||||
""
|
||||
#elif L==5
|
||||
""
|
||||
#elif L==6
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
""
|
||||
#elif L==8
|
||||
""
|
||||
#elif L==9
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_FAV
|
||||
""
|
||||
#elif L==2
|
||||
""
|
||||
#elif L==3
|
||||
""
|
||||
#elif L==4
|
||||
""
|
||||
#elif L==5
|
||||
""
|
||||
#elif L==6
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
""
|
||||
#elif L==8
|
||||
""
|
||||
#elif L==9
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_SHARE
|
||||
""
|
||||
#elif L==2
|
||||
""
|
||||
#elif L==3
|
||||
""
|
||||
#elif L==4
|
||||
""
|
||||
#elif L==5
|
||||
""
|
||||
#elif L==6
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
""
|
||||
#elif L==8
|
||||
""
|
||||
#elif L==9
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_FOLLOWER
|
||||
"Nous seguidors"
|
||||
#elif L==2
|
||||
"Neue Anhänger"
|
||||
#elif L==3
|
||||
"New followers"
|
||||
#elif L==4
|
||||
"Nuevos seguidores"
|
||||
#elif L==5
|
||||
"Nouveaux suiveurs"
|
||||
#elif L==6
|
||||
"Nuevos seguidores" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Nuovi followers"
|
||||
#elif L==8
|
||||
"Nowe obserwują"
|
||||
#elif L==9
|
||||
"Novos seguidores"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_FORUM_POST_COURSE
|
||||
|
|
@ -25129,6 +25261,26 @@ const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
"Novas respostas aos meus posts em fóruns"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_NOTICE
|
||||
"Nous avisos"
|
||||
#elif L==2
|
||||
"Neue Ankündigungen"
|
||||
#elif L==3
|
||||
"New notices"
|
||||
#elif L==4
|
||||
"Nuevos avisos"
|
||||
#elif L==5
|
||||
"Nouveaux avis"
|
||||
#elif L==6
|
||||
"Nuevos avisos" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Nuovi avvisi"
|
||||
#elif L==8
|
||||
"Nowe ogloszenia"
|
||||
#elif L==9
|
||||
"Novos avisos"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_MESSAGE
|
||||
"Nous missatges"
|
||||
#elif L==2
|
||||
|
|
@ -25167,26 +25319,6 @@ const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
"Nowe badania"
|
||||
#elif L==9
|
||||
"Novos inquéritos"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_FOLLOWER
|
||||
"Nous seguidors"
|
||||
#elif L==2
|
||||
"Neue Anhänger"
|
||||
#elif L==3
|
||||
"New followers"
|
||||
#elif L==4
|
||||
"Nuevos seguidores"
|
||||
#elif L==5
|
||||
"Nouveaux suiveurs"
|
||||
#elif L==6
|
||||
"Nuevos seguidores" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Nuovi followers"
|
||||
#elif L==8
|
||||
"Nowe obserwują"
|
||||
#elif L==9
|
||||
"Novos seguidores"
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
@ -25372,24 +25504,104 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
"Pedido de inscrição"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_NOTICE
|
||||
"Avís"
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_POST
|
||||
""
|
||||
#elif L==2
|
||||
"Ankündigungen"
|
||||
""
|
||||
#elif L==3
|
||||
"Notice"
|
||||
""
|
||||
#elif L==4
|
||||
"Aviso"
|
||||
""
|
||||
#elif L==5
|
||||
"Avis"
|
||||
""
|
||||
#elif L==6
|
||||
"Marandu"
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Avviso"
|
||||
""
|
||||
#elif L==8
|
||||
"Informacja"
|
||||
""
|
||||
#elif L==9
|
||||
"Anúncio"
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_COMMENT
|
||||
""
|
||||
#elif L==2
|
||||
""
|
||||
#elif L==3
|
||||
""
|
||||
#elif L==4
|
||||
""
|
||||
#elif L==5
|
||||
""
|
||||
#elif L==6
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
""
|
||||
#elif L==8
|
||||
""
|
||||
#elif L==9
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_FAV
|
||||
""
|
||||
#elif L==2
|
||||
""
|
||||
#elif L==3
|
||||
""
|
||||
#elif L==4
|
||||
""
|
||||
#elif L==5
|
||||
""
|
||||
#elif L==6
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
""
|
||||
#elif L==8
|
||||
""
|
||||
#elif L==9
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_SOCIAL_SHARE
|
||||
""
|
||||
#elif L==2
|
||||
""
|
||||
#elif L==3
|
||||
""
|
||||
#elif L==4
|
||||
""
|
||||
#elif L==5
|
||||
""
|
||||
#elif L==6
|
||||
"" // Okoteve traducción
|
||||
#elif L==7
|
||||
""
|
||||
#elif L==8
|
||||
""
|
||||
#elif L==9
|
||||
""
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_FOLLOWER
|
||||
"Seguidor"
|
||||
#elif L==2
|
||||
"Anhänger"
|
||||
#elif L==3
|
||||
"Follower"
|
||||
#elif L==4
|
||||
"Seguidor"
|
||||
#elif L==5
|
||||
"Suiveur"
|
||||
#elif L==6
|
||||
"Seguidor" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Follower"
|
||||
#elif L==8
|
||||
"Obserwują"
|
||||
#elif L==9
|
||||
"Seguidor"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_FORUM_POST_COURSE
|
||||
|
|
@ -25432,6 +25644,26 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
"Resposta em um fórum"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_NOTICE
|
||||
"Avís"
|
||||
#elif L==2
|
||||
"Ankündigungen"
|
||||
#elif L==3
|
||||
"Notice"
|
||||
#elif L==4
|
||||
"Aviso"
|
||||
#elif L==5
|
||||
"Avis"
|
||||
#elif L==6
|
||||
"Marandu"
|
||||
#elif L==7
|
||||
"Avviso"
|
||||
#elif L==8
|
||||
"Informacja"
|
||||
#elif L==9
|
||||
"Anúncio"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_MESSAGE
|
||||
"Missatge"
|
||||
#elif L==2
|
||||
|
|
@ -25470,26 +25702,6 @@ const char *Txt_NOTIFY_EVENTS_SINGULAR[Ntf_NUM_NOTIFY_EVENTS] =
|
|||
"Badania"
|
||||
#elif L==9
|
||||
"Inquérito"
|
||||
#endif
|
||||
,
|
||||
#if L==1 // Ntf_EVENT_FOLLOWER
|
||||
"Seguidor"
|
||||
#elif L==2
|
||||
"Anhänger"
|
||||
#elif L==3
|
||||
"Follower"
|
||||
#elif L==4
|
||||
"Seguidor"
|
||||
#elif L==5
|
||||
"Suiveur"
|
||||
#elif L==6
|
||||
"Seguidor" // Okoteve traducción
|
||||
#elif L==7
|
||||
"Follower"
|
||||
#elif L==8
|
||||
"Obserwują"
|
||||
#elif L==9
|
||||
"Seguidor"
|
||||
#endif
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue