From beb47c575f71d3fd0bb4a0eef29394ca9be847e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 8 Jul 2016 12:24:14 +0200 Subject: [PATCH] Version 15.242.1 --- chat/chat.html | 2 +- swad_changelog.h | 3 ++- swad_config.h | 4 ++-- swad_text.c | 4 ++-- swad_web_service.c | 16 ++++++++-------- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/chat/chat.html b/chat/chat.html index f3c4f967..0d9c4a63 100644 --- a/chat/chat.html +++ b/chat/chat.html @@ -7,7 +7,7 @@ A:link {text-decoration: none;} A:visited {text-decoration: none;} A:active {text-decoration: none;} A:hover {text-decoration: none;} -body {text-align:center; margin: 10px; background-color: #4F90C8; background-image: url('/swad/icon/theme/blue/head_row1_1x512.gif'); background-repeat: repeat-x;} +body {text-align:center; margin:10px; background-color:#4F90C8;} img {border-width:0px; border-style:none;} diff --git a/swad_changelog.h b/swad_changelog.h index 61f1e9bc..7a969af7 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -133,13 +133,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.242 (2016-07-07)" +#define Log_PLATFORM_VERSION "SWAD 15.242.1 (2016-07-08)" #define CSS_FILE "swad15.229.css" #define JS_FILE "swad15.238.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 15.242.1: Jul 08, 2016 URLs for users' photos in web service are sent with https instead of http. (203782 lines) Version 15.242: Jul 07, 2016 New option Profile > Agenda. Not implemented. (203781 lines) Version 15.241.7: Jul 06, 2016 Removed cookies in swad.ugr.es. Removed unused database tables. (203641 lines) diff --git a/swad_config.h b/swad_config.h index 1261b3d4..5d9597b2 100644 --- a/swad_config.h +++ b/swad_config.h @@ -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 SWADBERRY_UGR_ES // Comment this line if not applicable /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index 09bcc259..dc42ec7f 100644 --- a/swad_text.c +++ b/swad_text.c @@ -47151,9 +47151,9 @@ const char *Txt_TIMETABLE_CLASS_TYPES[TT_NUM_CLASS_TYPES] = #if L==1 "Lliure" #elif L==2 - "No class" -#elif L==3 "Keine Klasse" +#elif L==3 + "No class" #elif L==4 "Libre" #elif L==5 diff --git a/swad_web_service.c b/swad_web_service.c index 4aa4a5a9..6dd8daf1 100644 --- a/swad_web_service.c +++ b/swad_web_service.c @@ -880,7 +880,7 @@ int swad__loginByUserPasswordKey (struct soap *soap, strncpy (loginByUserPasswordKeyOut->userFirstname,Gbl.Usrs.Me.UsrDat.FirstName,255); loginByUserPasswordKeyOut->userFirstname[255] = '\0'; - Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL,true); strncpy (loginByUserPasswordKeyOut->userPhoto,PhotoURL,PATH_MAX); loginByUserPasswordKeyOut->userPhoto[PATH_MAX] = '\0'; @@ -1015,7 +1015,7 @@ int swad__loginBySessionKey (struct soap *soap, strncpy (loginBySessionKeyOut->userFirstname,Gbl.Usrs.Me.UsrDat.FirstName,255); loginBySessionKeyOut->userFirstname[255] = '\0'; - Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL,true); strncpy (loginBySessionKeyOut->userPhoto,PhotoURL,PATH_MAX); loginBySessionKeyOut->userPhoto[PATH_MAX] = '\0'; @@ -2008,7 +2008,7 @@ static void Svc_CopyUsrData (struct swad__user *Usr,struct UsrData *UsrDat,bool Usr->userFirstname[255] = '\0'; /* User's photo URL */ - Pho_BuildLinkToPhoto (UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (UsrDat,PhotoURL,true); Usr->userPhoto = (char *) soap_malloc (Gbl.soap,PATH_MAX+1); strncpy (Usr->userPhoto,PhotoURL,PATH_MAX); Usr->userPhoto[PATH_MAX] = '\0'; @@ -2110,7 +2110,7 @@ int swad__getAttendanceEvents (struct soap *soap, strcpy (getAttendanceEventsOut->eventsArray.__ptr[NumAttEvent].userFirstname, Gbl.Usrs.Other.UsrDat.FirstName); - Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,true); Length = strlen (PhotoURL); getAttendanceEventsOut->eventsArray.__ptr[NumAttEvent].userPhoto = (char *) soap_malloc (Gbl.soap,Length + 1); strcpy (getAttendanceEventsOut->eventsArray.__ptr[NumAttEvent].userPhoto, @@ -2480,7 +2480,7 @@ int swad__getAttendanceUsers (struct soap *soap, getAttendanceUsersOut->usersArray.__ptr[NumRow].userFirstname = (char *) soap_malloc (Gbl.soap,Length + 1); strcpy (getAttendanceUsersOut->usersArray.__ptr[NumRow].userFirstname,Gbl.Usrs.Other.UsrDat.FirstName); - Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,true); Length = strlen (PhotoURL); getAttendanceUsersOut->usersArray.__ptr[NumRow].userPhoto = (char *) soap_malloc (Gbl.soap,Length + 1); strcpy (getAttendanceUsersOut->usersArray.__ptr[NumRow].userPhoto,PhotoURL); @@ -2751,7 +2751,7 @@ int swad__getNotifications (struct soap *soap, strncpy (getNotificationsOut->notificationsArray.__ptr[NumRow].userFirstname,Gbl.Usrs.Other.UsrDat.FirstName,255); getNotificationsOut->notificationsArray.__ptr[NumRow].userFirstname[255] = '\0'; - Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,true); getNotificationsOut->notificationsArray.__ptr[NumRow].userPhoto = (char *) soap_malloc (Gbl.soap,PATH_MAX+1); strncpy (getNotificationsOut->notificationsArray.__ptr[NumRow].userPhoto,PhotoURL,PATH_MAX); getNotificationsOut->notificationsArray.__ptr[NumRow].userPhoto[PATH_MAX] = '\0'; @@ -4273,7 +4273,7 @@ static bool Svc_WriteRowFileBrowser (unsigned Level,Brw_FileType_t FileType,cons Gbl.Usrs.Other.UsrDat.UsrCod = FileMetadata.PublisherUsrCod; Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&Gbl.Usrs.Other.UsrDat); - Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (&Gbl.Usrs.Me.UsrDat,PhotoURL,true); fprintf (Gbl.F.XML,"" "%ld" @@ -4455,7 +4455,7 @@ int swad__getFile (struct soap *soap, strncpy (getFileOut->publisherName,Gbl.Usrs.Other.UsrDat.FullName,255+1+255+1+255); getFileOut->publisherName[255+1+255+1+255] = '\0'; - Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,false); + Pho_BuildLinkToPhoto (&Gbl.Usrs.Other.UsrDat,PhotoURL,true); strncpy (getFileOut->publisherPhoto,PhotoURL,PATH_MAX); getFileOut->publisherPhoto[PATH_MAX] = '\0'; }