From 1cf76a6f13b3e5caaf1bf8e53d731cbdcbe60208 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Tue, 14 May 2019 09:03:48 +0200
Subject: [PATCH] Version18.120.2

---
 .settings/language.settings.xml |  2 +-
 swad_box.c                      | 14 ++++++++++----
 swad_changelog.h                |  3 ++-
 swad_config.h                   |  4 ++--
 swad_form.c                     |  1 +
 swad_global.c                   |  2 --
 swad_global.h                   |  1 -
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml
index c4007c22..81abd5c3 100644
--- a/.settings/language.settings.xml
+++ b/.settings/language.settings.xml
@@ -11,7 +11,7 @@
             			
             <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuildCommandParser" id="org.eclipse.cdt.managedbuilder.core.GCCBuildCommandParser" keep-relative-paths="false" name="CDT GCC Build Output Parser" parameter="(g?cc)|([gc]\+\+)|(clang)" prefer-non-shared="true"/>
             			
-            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-525352425879766662" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+            <provider class="org.eclipse.cdt.managedbuilder.language.settings.providers.GCCBuiltinSpecsDetector" console="false" env-hash="-524711994852726662" id="org.eclipse.cdt.managedbuilder.core.GCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
                 				
                 <language-scope id="org.eclipse.cdt.core.gcc"/>
                 				
diff --git a/swad_box.c b/swad_box.c
index e4188052..b38a8a81 100644
--- a/swad_box.c
+++ b/swad_box.c
@@ -53,6 +53,12 @@ extern struct Globals Gbl;
 /******************************* Private types *******************************/
 /*****************************************************************************/
 
+/*****************************************************************************/
+/***************************** Private variabled *****************************/
+/*****************************************************************************/
+
+static unsigned Box_Nested = 0;
+
 /*****************************************************************************/
 /***************************** Private prototypes ****************************/
 /*****************************************************************************/
@@ -176,11 +182,11 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
       fprintf (Gbl.F.Out,"<div class=\"FRAME_TITLE %s\">"
 	                 "%s"
 	                 "</div>",
-	       Gbl.Layout.NestedBox ? "FRAME_TITLE_SMALL" :
-		                      "FRAME_TITLE_BIG",
+	       Box_Nested ? "FRAME_TITLE_SMALL" :
+		            "FRAME_TITLE_BIG",
 	       Title);
 
-   Gbl.Layout.NestedBox++;
+   Box_Nested++;
   }
 
 void Box_EndBoxTable (void)
@@ -203,7 +209,7 @@ void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton)
 
 void Box_EndBox (void)
   {
-   Gbl.Layout.NestedBox--;
+   Box_Nested--;
 
    /***** End box and box container *****/
    fprintf (Gbl.F.Out,"</div>"
diff --git a/swad_changelog.h b/swad_changelog.h
index 4ed11343..c878003d 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -448,10 +448,11 @@ En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
 
-#define Log_PLATFORM_VERSION	"SWAD 18.120.1 (2019-04-25)"
+#define Log_PLATFORM_VERSION	"SWAD 18.120.2 (2019-04-30)"
 #define CSS_FILE		"swad18.112.1.css"
 #define JS_FILE			"swad18.116.5.js"
 /*
+	Version 18.120.2: Apr 30, 2019	Code refactoring related to boxes. (242465 lines)
 	Version 18.120.1: Apr 25, 2019	Code refactoring related to file browser. (242461 lines)
 	Version 18.120:   Apr 25, 2019	Code refactoring related to file browser. (242466 lines)
 	Version 18.119:   Apr 25, 2019	Code refactoring related to selected users. (242536 lines)
diff --git a/swad_config.h b/swad_config.h
index 1aeecba9..3b7bff2f 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_form.c b/swad_form.c
index d0672ccd..f8fee979 100644
--- a/swad_form.c
+++ b/swad_form.c
@@ -27,6 +27,7 @@
 
 #define _GNU_SOURCE 		// For asprintf
 #include <stdio.h>		// For asprintf
+#include <stdlib.h>		// For free
 
 #include "swad_form.h"
 #include "swad_global.h"
diff --git a/swad_global.c b/swad_global.c
index 20213b5d..87707f3a 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -402,8 +402,6 @@ void Gbl_InitializeGlobals (void)
 
    Gbl.WebService.Function = Svc_unknown;
 
-   Gbl.Layout.NestedBox = 0;
-
    /* Flush caches */
    Cty_FlushCacheCountryName ();
    Ins_FlushCacheShortNameOfInstitution ();
diff --git a/swad_global.h b/swad_global.h
index 5d7b6378..7f66600a 100644
--- a/swad_global.h
+++ b/swad_global.h
@@ -143,7 +143,6 @@ struct Globals
       bool HTMLStartWritten;	// Used to avoid writing more than once the HTML head
       bool DivsEndWritten;	// Used to avoid writing more than once the HTML end
       bool HTMLEndWritten;	// Used to avoid writing more than once the HTML end
-      unsigned NestedBox;
      } Layout;
    struct
      {