From e678096d83988b758a0d75cecfa2a7b2b2766785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Wed, 30 Oct 2019 09:12:12 +0100
Subject: [PATCH] Version19.46.6

---
 swad_HTML.c      |  4 ++--
 swad_HTML.h      |  2 +-
 swad_centre.c    | 21 ++++++++++++---------
 swad_changelog.h |  3 ++-
 swad_layout.c    | 35 +++++++++++++++++------------------
 5 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/swad_HTML.c b/swad_HTML.c
index edb7deca..5f5d0999 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -708,7 +708,7 @@ void HTM_A_End (void)
 /********************************** Images ***********************************/
 /*****************************************************************************/
 
-void HTM_IMG (const char *Path,const char *Icon,const char *Title,
+void HTM_IMG (const char *URL,const char *Icon,const char *Title,
 	      const char *Class,const char *Style,const char *Id)
   {
    fprintf (Gbl.F.Out,"<img");
@@ -717,7 +717,7 @@ void HTM_IMG (const char *Path,const char *Icon,const char *Title,
       if (Id[0])
 	 fprintf (Gbl.F.Out," id=\"%s\"",Id);
 
-   fprintf (Gbl.F.Out," src=\"%s/%s\"",Path,Icon);
+   fprintf (Gbl.F.Out," src=\"%s/%s\"",URL,Icon);
 
    if (Title)
      {
diff --git a/swad_HTML.h b/swad_HTML.h
index 42de6677..12ca02cc 100644
--- a/swad_HTML.h
+++ b/swad_HTML.h
@@ -83,7 +83,7 @@ void HTM_LI_End (void);
 void HTM_A_Begin (const char *fmt,...);
 void HTM_A_End (void);
 
-void HTM_IMG (const char *Path,const char *Icon,const char *Title,
+void HTM_IMG (const char *URL,const char *Icon,const char *Title,
 	      const char *Class,const char *Style,const char *Id);
 
 #endif
diff --git a/swad_centre.c b/swad_centre.c
index 15022da1..1b4f1f19 100644
--- a/swad_centre.c
+++ b/swad_centre.c
@@ -309,6 +309,8 @@ static void Ctr_Configuration (bool PrintView)
    bool PhotoExists;
    char *PhotoAttribution = NULL;
    bool PutLink;
+   char URL[Cns_MAX_BYTES_WWW + 1];
+   char Icon[NAME_MAX + 1];
 
    /***** Trivial check *****/
    if (Gbl.Hierarchy.Ctr.CtrCod <= 0)		// No centre selected
@@ -357,17 +359,18 @@ static void Ctr_Configuration (bool PrintView)
       if (PutLink)
 	 HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"",
 		      Gbl.Hierarchy.Ctr.WWW);
-      fprintf (Gbl.F.Out,"<img src=\"%s/%02u/%u/%u.jpg\""
-			 " alt=\"%s\" title=\"%s\""
-			 " class=\"%s\" />",
-	       Cfg_URL_CTR_PUBLIC,
+      snprintf (URL,sizeof (URL),
+		"%s/%02u/%u",
+		Cfg_URL_CTR_PUBLIC,
 	       (unsigned) (Gbl.Hierarchy.Ctr.CtrCod % 100),
-	       (unsigned) Gbl.Hierarchy.Ctr.CtrCod,
-	       (unsigned) Gbl.Hierarchy.Ctr.CtrCod,
-	       Gbl.Hierarchy.Ctr.ShrtName,
-	       Gbl.Hierarchy.Ctr.FullName,
+	       (unsigned) Gbl.Hierarchy.Ctr.CtrCod);
+      snprintf (Icon,sizeof (Icon),
+		"%u.jpg",
+		(unsigned) Gbl.Hierarchy.Ctr.CtrCod);
+      HTM_IMG (URL,Icon,Gbl.Hierarchy.Ctr.FullName,
 	       PrintView ? "CENTRE_PHOTO_PRINT" :
-			   "CENTRE_PHOTO_SHOW");
+			   "CENTRE_PHOTO_SHOW",
+	       NULL,NULL);
       if (PutLink)
 	 HTM_A_End ();
       HTM_DIV_End ();
diff --git a/swad_changelog.h b/swad_changelog.h
index 7fe1fafc..84792a0a 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
 En OpenSWAD:
 ps2pdf source.ps destination.pdf
 */
-#define Log_PLATFORM_VERSION	"SWAD 19.46.5 (2019-10-29)"
+#define Log_PLATFORM_VERSION	"SWAD 19.46.6 (2019-10-29)"
 #define CSS_FILE		"swad19.45.css"
 #define JS_FILE			"swad19.39.js"
 /*
@@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
 // TODO: Impedir la creación y edición de proyectos si no son editables.
 // TODO: Continuar convirtiendo <img a HTM_IMG ()
 
+	Version 19.46.6:  Oct 29, 2019	Code refactoring in HTML images. (246226 lines)
 	Version 19.46.5:  Oct 29, 2019	Code refactoring in HTML images. (246223 lines)
 	Version 19.46.4:  Oct 28, 2019	Code refactoring in HTML images. (246247 lines)
 	Version 19.46.3:  Oct 28, 2019	Code refactoring in HTML images. (246390 lines)
diff --git a/swad_layout.c b/swad_layout.c
index 44d1134a..2438762e 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -895,6 +895,7 @@ static void Lay_WritePageTopHeading (void)
    extern const char *Txt_System;
    extern const char *Txt_TAGLINE;
    extern const char *Txt_TAGLINE_BR;
+   char Style[64];
    const char *ClassHeadRow1[The_NUM_THEMES] =
      {
       "HEAD_ROW_1_WHITE",	// The_THEME_WHITE
@@ -930,22 +931,20 @@ static void Lay_WritePageTopHeading (void)
 
    HTM_DIV_Begin ("id=\"head_row_1_logo_small\"");
    Frm_LinkFormSubmit (Txt_System,NULL,NULL);
-   fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
-                      " class=\"CM\""
-	              " style=\"width:%upx; height:%upx;\" />",
-            Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
-            Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
-            Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
+   snprintf (Style,sizeof (Style),
+	     "width:%upx; height:%upx;",
+	     Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
+   HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_SMALL_FILENAME,Cfg_PLATFORM_SHORT_NAME,
+	    "CM",Style,NULL);
    Frm_LinkFormEnd ();
    HTM_DIV_End ();	// head_row_1_logo_small
    HTM_DIV_Begin ("id=\"head_row_1_logo_big\"");
    Frm_LinkFormSubmit (Txt_System,NULL,NULL);
-   fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
-                      " class=\"CM\""
-	              " style=\"width:%upx; height:%upx;\" />",
-            Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_BIG_FILENAME,
-            Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
-            Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
+   snprintf (Style,sizeof (Style),
+	     "width:%upx; height:%upx;",
+	     Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
+   HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_BIG_FILENAME,Cfg_PLATFORM_SHORT_NAME,
+	    "CM",Style,NULL);
    Frm_LinkFormEnd ();
    HTM_DIV_End ();	// head_row_1_logo_big
    HTM_DIV_Begin ("id=\"head_row_1_tagline\"");
@@ -1421,18 +1420,18 @@ static void Lay_WriteAboutZone (void)
   {
    extern const char *Txt_About_X;
    extern const char *Txt_Questions_and_problems;
+   char Style[64];
 
    /***** Start about zone *****/
    fprintf (Gbl.F.Out,"<address id=\"about_zone\" class=\"ABOUT\">");
 
    /***** Institution and centre hosting the platform *****/
    HTM_A_Begin ("href=\"%s\" class=\"ABOUT\" target=\"_blank\"",Cfg_ABOUT_URL);
-   fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
-		      " alt=\"%s\" title=\"%s\""
-		      " style=\"width:%upx; height:%upx;\" />",
-	    Cfg_URL_ICON_PUBLIC,Cfg_ABOUT_LOGO,
-	    Cfg_ABOUT_NAME,Cfg_ABOUT_NAME,
-	    Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT);
+   snprintf (Style,sizeof (Style),
+	     "width:%upx; height:%upx;",
+	     Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT);
+   HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_ABOUT_LOGO,Cfg_ABOUT_NAME,
+	    NULL,Style,NULL);
    HTM_DIV_Begin (NULL);
    fprintf (Gbl.F.Out,"%s",Cfg_ABOUT_NAME);
    HTM_DIV_End ();