From 0a1c538e4a42a4840302d22660cd8ac18c922dfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Fri, 15 Jul 2016 18:39:19 +0200
Subject: [PATCH] Version 15.242.4

---
 sql/swad.sql     | 11 ++++-------
 swad_changelog.h |  6 +++++-
 swad_config.h    |  6 +++---
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/sql/swad.sql b/sql/swad.sql
index d03fc19cd..ed7679e9a 100644
--- a/sql/swad.sql
+++ b/sql/swad.sql
@@ -457,17 +457,14 @@ CREATE TABLE IF NOT EXISTS file_browser_last (
 --
 CREATE TABLE IF NOT EXISTS file_browser_size (
 	FileBrowser TINYINT NOT NULL,
-	CrsCod INT NOT NULL DEFAULT -1,
-	GrpCod INT NOT NULL DEFAULT -1,
-	UsrCod INT NOT NULL DEFAULT -1,
+	Cod INT NOT NULL DEFAULT -1,
+	ZoneUsrCod INT NOT NULL DEFAULT -1,
 	NumLevels INT NOT NULL,
 	NumFolders INT NOT NULL,
 	NumFiles INT NOT NULL,
 	TotalSize BIGINT NOT NULL,
-	UNIQUE INDEX(FileBrowser,CrsCod,GrpCod,UsrCod),
-	INDEX(CrsCod),
-	INDEX(GrpCod),
-	INDEX(UsrCod));
+	UNIQUE INDEX(FileBrowser,Cod,ZoneUsrCod),
+	INDEX(ZoneUsrCod));
 --
 -- Table file_view: stores the number of times each user has seen each file
 --
diff --git a/swad_changelog.h b/swad_changelog.h
index 4ec005a63..179e65204 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -130,18 +130,22 @@
 // TODO: Send attached photos via SOAP?
 
 // TODO: In list of users, institution should be the institution photo with internal link to institution
+// TODO: IMPORTANT FOR SWADROID: For reasons of speed, when getting list of users (find/get), get all main data in the find/get query, do not iterate with multiple queries
+// TODO: Remove "e-mail" column from list of users (usually it's not necessary)
+// TODO: Upload photos/files from SWADroid using MIME attachments
 
 /*****************************************************************************/
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 15.242.3 (2016-07-14)"
+#define Log_PLATFORM_VERSION	"SWAD 15.242.4 (2016-07-15)"
 #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.4: Jul 15, 2016	Fixed bug in creation of database table file_browser_size. (203847 lines)
         Version 15.242.3: Jul 14, 2016	Fixed bug in getting/finding users, due to default mysql mode in 5.7 which is ONLY_FULL_GROUP_BY. (203846 lines)
         Version 15.242.2: Jul 08, 2016	Code refactoring related to users' photos.
 					Fixed bug in chat. (203778 lines)
diff --git a/swad_config.h b/swad_config.h
index aca87917e..e4e74b80f 100644
--- a/swad_config.h
+++ b/swad_config.h
@@ -28,10 +28,10 @@
 /** 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 SWADBERRY_UGR_ES	// Comment this line if not applicable
+#define SWADBERRY_UGR_ES	// Comment this line if not applicable
 
 /*****************************************************************************/
 /********************************* Headers ***********************************/
@@ -226,7 +226,7 @@
 #define Cfg_PLATFORM_SHORT_NAME			"SWADberry"
 #define Cfg_PLATFORM_FULL_NAME			"SWADberry (Shared Workspace At a Distance on a Raspberry Pi)"
 #define Cfg_PLATFORM_SERVER			"swadberry.ugr.es"		// Server name (main part of the URL)
-#define Cfg_URL_SWAD_CGI			"https://swadberry.ugr.es/swad"	// Without ending slash
+#define Cfg_URL_SWAD_CGI			"https://swadberry.ugr.es"	// Without ending slash
 #define Cfg_URL_SWAD_PUBLIC			"https://swadberry.ugr.es/swad"	// Without ending slash
 #define Cfg_PATH_CGI_BIN			"/usr/lib/cgi-bin/swad"		// Directory for this CGI and other commands called by it
 #define Cfg_PATH_SWAD_PUBLIC			"/var/www/html/swad"		// Main public directory for public SWAD pages, icons, etc.