diff --git a/sql/swad.sql b/sql/swad.sql index eadf81098..f7f1484b4 100644 --- a/sql/swad.sql +++ b/sql/swad.sql @@ -678,6 +678,13 @@ CREATE TABLE IF NOT EXISTS log_recent ( INDEX(UsrCod), INDEX(ClickTime,Role)); -- +-- Table log_search: stores the log of search strings +-- +CREATE TABLE IF NOT EXISTS log_search ( + LogCod INT NOT NULL, + SearchStr VARCHAR(255) NOT NULL, + UNIQUE INDEX(LogCod)); +-- -- Table log_ws: stores the log of calls to web service from plugins -- CREATE TABLE IF NOT EXISTS log_ws ( diff --git a/swad_changelog.h b/swad_changelog.h index 54c5fbb91..6335e655e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -202,13 +202,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.142 (2017-02-27)" +#define Log_PLATFORM_VERSION "SWAD 16.142.1 (2017-02-27)" #define CSS_FILE "swad16.139.6.css" #define JS_FILE "swad16.141.1.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 16.142.1: Feb 27, 2017 Public activity is renamed as timeline. (213085 lines) Version 16.142: Feb 27, 2017 Searches are registered anonymously. (213077 lines) 1 change necessary in database: CREATE TABLE IF NOT EXISTS log_search (LogCod INT NOT NULL,SearchStr VARCHAR(255) NOT NULL,UNIQUE INDEX(LogCod)); diff --git a/swad_privacy.c b/swad_privacy.c index 820a0681e..1a7fe7b57 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -94,7 +94,7 @@ void Pri_EditMyPrivacy (void) extern const char *Txt_Privacy; extern const char *Txt_Photo; extern const char *Txt_Public_profile; - extern const char *Txt_Public_activity; + extern const char *Txt_Timeline; /***** If any of my preferences about privacy is unknown *****/ if (Gbl.Usrs.Me.UsrDat.PhotoVisibility == Pri_VISIBILITY_UNKNOWN || @@ -125,7 +125,7 @@ void Pri_EditMyPrivacy (void) (1 << Pri_VISIBILITY_WORLD)); /***** Edit public activity (timeline) visibility *****/ - Pri_PutFormVisibility (Txt_Public_activity, + Pri_PutFormVisibility (Txt_Timeline, ActUnk,"VisTml", Pri_VISIBILITY_SYSTEM, (1 << Pri_VISIBILITY_SYSTEM)); diff --git a/swad_social.c b/swad_social.c index 250dbda09..4159a366a 100644 --- a/swad_social.c +++ b/swad_social.c @@ -357,7 +357,7 @@ void Soc_ShowTimelineGbl2 (void) static void Soc_ShowTimelineGblHighlightingNot (long NotCod) { - extern const char *Txt_Public_activity; + extern const char *Txt_Timeline; char Query[1024]; /***** Build query to get timeline *****/ @@ -366,7 +366,7 @@ static void Soc_ShowTimelineGblHighlightingNot (long NotCod) Query); /***** Show timeline *****/ - Soc_ShowTimeline (Query,Txt_Public_activity,NotCod); + Soc_ShowTimeline (Query,Txt_Timeline,NotCod); /***** Drop temporary tables *****/ Soc_DropTemporaryTablesUsedToQueryTimeline (); @@ -383,7 +383,7 @@ void Soc_ShowTimelineUsr (void) static void Soc_ShowTimelineUsrHighlightingNot (long NotCod) { - extern const char *Txt_Public_activity_OF_A_USER; + extern const char *Txt_Timeline_OF_A_USER; char Query[1024]; /***** Build query to show timeline with publishings of a unique user *****/ @@ -392,7 +392,7 @@ static void Soc_ShowTimelineUsrHighlightingNot (long NotCod) Query); /***** Show timeline *****/ - sprintf (Gbl.Title,Txt_Public_activity_OF_A_USER,Gbl.Usrs.Other.UsrDat.FirstName); + sprintf (Gbl.Title,Txt_Timeline_OF_A_USER,Gbl.Usrs.Other.UsrDat.FirstName); Soc_ShowTimeline (Query,Gbl.Title,NotCod); /***** Drop temporary tables *****/ diff --git a/swad_text.c b/swad_text.c index 3afcff97f..4d75cbc38 100644 --- a/swad_text.c +++ b/swad_text.c @@ -19135,23 +19135,23 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = // TabSoc ***************************************************** // 0: ActSeeSocTmlGbl #if L==1 - "Activitat" + "Timeline" #elif L==2 - "Aktivität" + "Timeline" #elif L==3 - "Activity" + "Timeline" #elif L==4 - "Actividad" + "Timeline" #elif L==5 - "Activité" + "Chronologie" #elif L==6 - "Actividad" // Okoteve traducción + "Timeline" // Okoteve traducción #elif L==7 - "Attività" + "Timeline" #elif L==8 - "Aktywność" + "Timeline" #elif L==9 - "Atividade" + "Timeline" #endif , // 1: ActSeeSocPrf @@ -21193,23 +21193,23 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = // TabSoc ***************************************************** // 0: ActSeeSocTmlGbl #if L==1 - "Activitat pública dels usuaris que segueixo" + "Timeline dels usuaris que segueixo o de tots els usuaris" #elif L==2 - "Öffentliche Aktivität der Nutzer Ich folge" + "Timeline der Benutzer Ich folge oder alle Benutzern" #elif L==3 - "Public activity of the users I follow" + "Timeline of users I follow or all users" #elif L==4 - "Actividad pública de los usuarios que sigo" + "Timeline de los usuarios que sigo o de todos los usuarios" #elif L==5 - "Activité publique des utilisateurs je suivre" + "Chronologie des utilisateurs que je suis ou de tous les utilisateurs" #elif L==6 - "Actividad pública de los usuarios que sigo" // Okoteve traducción + "Timeline de los usuarios que sigo o de todos los usuarios" // Okoteve traducción #elif L==7 - "Attività pubblica degli utenti che seguo" + "Timeline degli utenti che seguo o tutti gli utenti" #elif L==8 - "Aktywność publiczna użytkowników śledzę" + "Timeline użytkowników śledzę lub wszystkich użytkowników" #elif L==9 - "Atividade pública dos usuários que eu sigo" + "Timeline dos usuários que eu sigo ou de todos os usuários" #endif , // 1: ActSeeSocPrf @@ -29863,48 +29863,6 @@ const char *Txt_posts = "posts"; #endif -const char *Txt_Public_activity = -#if L==1 - "Activitat pública"; -#elif L==2 - "Öffentliche Aktivität"; -#elif L==3 - "Public activity"; -#elif L==4 - "Actividad pública"; -#elif L==5 - "Activité public"; -#elif L==6 - "Actividad pública"; // Okoteve traducción -#elif L==7 - "Attività pubblica"; -#elif L==8 - "Aktywność publiczne"; -#elif L==9 - "Atividade pública"; -#endif - -const char *Txt_Public_activity_OF_A_USER = // Warning: it is very important to include %s in the following sentences -#if L==1 - "Activitat pública de %s"; -#elif L==2 - "%s öffentliche Aktivität"; -#elif L==3 - "%s public activity"; -#elif L==4 - "Actividad pública de %s"; -#elif L==5 - "Activité public de %s"; -#elif L==6 - "Actividad pública de %s"; // Okoteve traducción -#elif L==7 - "Attività pubblica di %s"; -#elif L==8 - "Aktywność publiczna %s"; -#elif L==9 - "Atividade pública de %s"; -#endif - const char *Txt_Public_agenda_USER = // Warning: it is very important to include %s in the following sentences #if L==1 "Agenda pública de %s"; @@ -39551,23 +39509,23 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] = #endif , #if L==1 // Sta_SOCIAL_ACTIVITY - "Activitat pública" + "Timeline" #elif L==2 - "Öffentliche Aktivität" + "Timeline" #elif L==3 - "Public activity" + "Timeline" #elif L==4 - "Actividad pública" + "Timeline" #elif L==5 - "Activité public" + "Chronologie" #elif L==6 - "Actividad pública" // Okoteve traducción + "Timeline" // Okoteve traducción #elif L==7 - "Attività pubblica" + "Timeline" #elif L==8 - "Aktywność publiczne" + "Timeline" #elif L==9 - "Atividade pública" + "Timeline" #endif , #if L==1 // Sta_FOLLOW @@ -47779,6 +47737,48 @@ const char *Txt_Time_zone_used_in_the_calculation_of_these_statistics = "Fuso horário utilizado no cálculo dessas estatísticas"; #endif +const char *Txt_Timeline = +#if L==1 + "Timeline"; +#elif L==2 + "Timeline"; +#elif L==3 + "Timeline"; +#elif L==4 + "Timeline"; +#elif L==5 + "Chronologie"; +#elif L==6 + "Timeline"; // Okoteve traducción +#elif L==7 + "Timeline"; +#elif L==8 + "Timeline"; +#elif L==9 + "Timeline"; +#endif + +const char *Txt_Timeline_OF_A_USER = // Warning: it is very important to include %s in the following sentences +#if L==1 + "Timeline de %s"; +#elif L==2 + "%s timeline"; +#elif L==3 + "%s timeline"; +#elif L==4 + "Timeline de %s"; +#elif L==5 + "Chronologie de %s"; +#elif L==6 + "Timeline de %s"; // Okoteve traducción +#elif L==7 + "Timeline di %s"; +#elif L==8 + "Timeline %s"; +#elif L==9 + "Timeline de %s"; +#endif + const char *Txt_TIMELINE_WHICH_USERS[Soc_NUM_WHICH_USRS] = { // Soc_FOLLOWED