From 36843ef246a3f870164263f088af67623527d04a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= <acanas@ugr.es>
Date: Mon, 4 Nov 2019 13:58:12 +0100
Subject: [PATCH] Version19.51.16

---
 swad_HTML.c      | 38 ++++++++++++++++++++++++++++++++++++++
 swad_HTML.h      |  2 ++
 swad_changelog.h |  3 ++-
 swad_record.c    | 26 ++++++--------------------
 4 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/swad_HTML.c b/swad_HTML.c
index c803175b..c63584c5 100644
--- a/swad_HTML.c
+++ b/swad_HTML.c
@@ -833,6 +833,44 @@ void HTM_INPUT_TEXT (const char *Name,unsigned MaxLength,const char *Value,bool
    fprintf (Gbl.F.Out," />");
   }
 
+void HTM_INPUT_TEL (const char *Name,const char *Value,bool SubmitOnChange,
+	            const char *fmt,...)
+  {
+   va_list ap;
+   int NumBytesPrinted;
+   char *Attr;
+
+   fprintf (Gbl.F.Out,"<input type=\"tel\" id=\"%s\" name=\"%s\""
+		      " maxlength=\"%u\" value=\"%s\"",
+	    Name,Name,Usr_MAX_CHARS_PHONE,Value);
+
+   if (fmt)
+     {
+      if (fmt[0])
+	{
+	 va_start (ap,fmt);
+	 NumBytesPrinted = vasprintf (&Attr,fmt,ap);
+	 va_end (ap);
+
+	 if (NumBytesPrinted < 0)	// If memory allocation wasn't possible,
+					// or some other error occurs,
+					// vasprintf will return -1
+	    Lay_NotEnoughMemoryExit ();
+
+	 /***** Print attributes *****/
+	 fprintf (Gbl.F.Out," %s",Attr);
+
+	 free ((void *) Attr);
+	}
+     }
+
+   if (SubmitOnChange)
+      fprintf (Gbl.F.Out," onchange=\"document.getElementById('%s').submit();\"",
+	       Gbl.Form.Id);
+
+   fprintf (Gbl.F.Out," />");
+  }
+
 void HTM_INPUT_EMAIL (const char *Name,unsigned MaxLength,const char *Value,
 	              const char *fmt,...)
   {
diff --git a/swad_HTML.h b/swad_HTML.h
index 21b5a74b..f494feef 100644
--- a/swad_HTML.h
+++ b/swad_HTML.h
@@ -91,6 +91,8 @@ void HTM_LABEL_End (void);
 
 void HTM_INPUT_TEXT (const char *Name,unsigned MaxLength,const char *Value,bool SubmitOnChange,
 	             const char *fmt,...);
+void HTM_INPUT_TEL (const char *Name,const char *Value,bool SubmitOnChange,
+	            const char *fmt,...);
 void HTM_INPUT_EMAIL (const char *Name,unsigned MaxLength,const char *Value,
 	              const char *fmt,...);
 void HTM_INPUT_URL (const char *Name,const char *Value,bool SubmitOnChange,
diff --git a/swad_changelog.h b/swad_changelog.h
index aa07c7ee..fed04485 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.51.15 (2019-11-04)"
+#define Log_PLATFORM_VERSION	"SWAD 19.51.16 (2019-11-04)"
 #define CSS_FILE		"swad19.47.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: Importante: filtrar proyectos por usuarios (igual que en trabajos o en asistencia)
 
+	Version 19.51.16: Nov 04, 2019	Code refactoring in HTML inputs. (245893 lines)
 	Version 19.51.15: Nov 04, 2019	Code refactoring in HTML inputs. (245874 lines)
 	Version 19.51.14: Nov 04, 2019	Code refactoring in HTML inputs. (245868 lines)
 	Version 19.51.13: Nov 04, 2019	Code refactoring in HTML inputs. (245874 lines)
diff --git a/swad_record.c b/swad_record.c
index 17a33ae2..9324d9b9 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -3426,12 +3426,8 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,
    if (ShowData)
      {
       if (ICanEdit)
-	 fprintf (Gbl.F.Out,"<input type=\"tel\""
-	                    " id=\"LocalPhone\" name=\"LocalPhone\""
-			    " maxlength=\"%u\" value=\"%s\""
-			    " class=\"REC_C2_BOT_INPUT\" />",
-		  Usr_MAX_CHARS_PHONE,
-		  UsrDat->LocalPhone);
+	 HTM_INPUT_TEL ("LocalPhone",UsrDat->LocalPhone,false,
+	                " class=\"REC_C2_BOT_INPUT\"");
       else if (UsrDat->LocalPhone[0])
 	{
 	 HTM_A_Begin ("href=\"tel:%s\" class=\"REC_DAT_BOLD\"",UsrDat->LocalPhone);
@@ -3499,12 +3495,8 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
    if (ShowData)
      {
       if (ICanEdit)
-	 fprintf (Gbl.F.Out,"<input type=\"tel\""
-	                    " id=\"FamilyPhone\" name=\"FamilyPhone\""
-			    " maxlength=\"%u\" value=\"%s\""
-			    " class=\"REC_C2_BOT_INPUT\" />",
-		  Usr_MAX_CHARS_PHONE,
-		  UsrDat->FamilyPhone);
+	 HTM_INPUT_TEL ("FamilyPhone",UsrDat->FamilyPhone,false,
+	                " class=\"REC_C2_BOT_INPUT\"");
       else if (UsrDat->FamilyPhone[0])
 	{
 	 HTM_A_Begin ("href=\"tel:%s\" class=\"REC_DAT_BOLD\"",UsrDat->FamilyPhone);
@@ -4200,14 +4192,8 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
 
       HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
       Frm_StartFormAnchor (ActChgMyOffPho,Rec_MY_INS_CTR_DPT_ID);
-      fprintf (Gbl.F.Out,"<input type=\"tel\""
-	                 " id=\"OfficePhone\" name=\"OfficePhone\""
-			 " maxlength=\"%u\" value=\"%s\""
-		         " class=\"REC_C2_BOT_INPUT\""
-			 " onchange=\"document.getElementById('%s').submit();\" />",
-	       Usr_MAX_CHARS_PHONE,
-	       Gbl.Usrs.Me.UsrDat.Tch.OfficePhone,
-	       Gbl.Form.Id);
+      HTM_INPUT_TEL ("OfficePhone",Gbl.Usrs.Me.UsrDat.Tch.OfficePhone,true,
+		     " class=\"REC_C2_BOT_INPUT\"");
       Frm_EndForm ();
       HTM_TD_End ();