From 37619a832472193dbe71476475f34f263bef36de Mon Sep 17 00:00:00 2001 From: kleper Date: Mon, 10 Dec 2018 10:59:54 -0500 Subject: [PATCH 1/2] Para que el mapa soporte markDown --- geojson.js.php | 1 + 1 file changed, 1 insertion(+) diff --git a/geojson.js.php b/geojson.js.php index 3ec03c6..61defb4 100644 --- a/geojson.js.php +++ b/geojson.js.php @@ -4,6 +4,7 @@ require ('xajax/xajax.inc.php'); $xajax = new xajax(); require ('funciones/funciones.php'); require ('funciones/convert.php'); +include ('librerias/parsedown/Parsedown.php'); require ("funciones/conex.php"); From a0c952a406f7f43df8deebe17264bbdbf0b39cde Mon Sep 17 00:00:00 2001 From: humano Date: Tue, 11 Dec 2018 09:26:44 -0500 Subject: [PATCH 2/2] cambios en envio de email --- funciones/funciones.php | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/funciones/funciones.php b/funciones/funciones.php index fbfb899..0d0b641 100644 --- a/funciones/funciones.php +++ b/funciones/funciones.php @@ -3552,7 +3552,7 @@ if($accion =="enviar" OR $accion =="preview" ) { $nombre_respuesta= $formulario['nombre_respuesta']; $email_respuesta= $formulario['correo_respuesta']; $campo_nombre = $formulario['nombre']; - $email = remplacetas("empresa","id","$id_empresa","email",""); + $email = remplacetas("empresa","id","1","email",""); $razon_social = remplacetas("empresa","id",$id_empresa,"razon_social",""); $id_formulario = $formulario['formulario']; @@ -5338,7 +5338,7 @@ $tipo='success'; $direccion = remplacetas("empresa","id",$id_empresa,"direccion",""); $telefono = remplacetas("empresa","id",$id_empresa,"telefono",""); $web = remplacetas("empresa","id",$id_empresa,"web",""); - $email = remplacetas("empresa","id",$id_empresa,"email",""); + $email = remplacetas("empresa","id","1","email",""); $imagen = remplacetas("empresa","id",$id_empresa,"imagen",""); $razon_social = remplacetas("empresa","id",$id_empresa,"razon_social",""); $slogan = remplacetas("empresa","id",$id_empresa,"slogan",""); @@ -8290,21 +8290,28 @@ return $formulario; $web = remplacetas("empresa","id",$id_empresa,"web",""); //// siempre se enviara el email desde el mail parametrizado en la empresa 1 //$email = remplacetas("empresa","id","1","email",""); - $email = remplacetas("empresa","id","$id_empresa","email",""); + $email = remplacetas("empresa","id","1","email",""); $reply = remplacetas("empresa","id","$id_empresa","email",""); $imagen = remplacetas("empresa","id",$id_empresa,"imagen",""); $razon_social = remplacetas("empresa","id",$id_empresa,"razon_social",""); $slogan = remplacetas("empresa","id",$id_empresa,"slogan",""); $nombre_formulario = remplacetas("form_id","id",$id,"nombre",""); - +/* + * $headers = "MIME-Version: 1.0\r\n"; + $headers .= "Content-type: text/html; charset=utf-8\r\n"; + $headers .= "From: $nombre_respuesta <".$email[0].">\r\n"; + $headers .= "Reply-To: $nombre_respuesta <".$email_respuesta.">\r\n"; + $headers .= "Return-path: <$email[0]>\r\n"; + * + * */ $headers = "MIME-Version: 1.0\r\n"; -$headers .= "Content-type: text/html; charset=iso-8859-1\r\n"; -$headers .= "From: $razon_social[0] <$email[0]>\r\n"; -$headers .= "Reply-To: $razon_social[0] <$reply[0]>\r\n"; -$headers .= "Return-path: $email[0]\r\n"; +$headers .= "Content-type: text/html; charset=utf-8\r\n"; +$headers .= "From: $razon_social[0] <".$email[0].">\r\n"; +$headers .= "Reply-To: $razon_social[0] <".$reply[0].">\r\n"; +$headers .= "Return-path: <".$email[0].">\r\n"; $headers .= "Cc: $propietario[0]" . "\r\n"; -$impresion = formulario_imprimir("$id","$control","email"); +$impresion = formulario_imprimir("$id","$control","email",""); $impresion =" $encabezado @@ -9681,7 +9688,7 @@ $respuesta = new xajaxResponse('utf-8'); if($accion=="enviar") { $id_empresa="1"; - $email_empresa = remplacetas("empresa","id","$id_empresa","email",""); + $email_empresa = remplacetas("empresa","id","1","email",""); $administrador = remplacetas("empresa","id","1","email",""); $reply = remplacetas("empresa","id","$id_empresa","email",""); $imagen = remplacetas("empresa","id",$id_empresa,"imagen",""); @@ -17803,7 +17810,7 @@ $mensaje_agradecimiento = remplacetas('form_parametrizacion','campo',"$formulari $web = remplacetas("empresa","id",$id_empresa,"web",""); //// siempre se enviara el email desde el mail parametrizado en la empresa 1 //$email = remplacetas("empresa","id","1","email",""); - $email = remplacetas("empresa","id","$id_empresa","email",""); + $email = remplacetas("empresa","id","1","email",""); $reply = remplacetas("empresa","id","$id_empresa","email",""); $imagen = remplacetas("empresa","id",$id_empresa,"imagen",""); $razon_social = remplacetas("empresa","id",$id_empresa,"razon_social",""); @@ -18893,7 +18900,7 @@ $respuesta = new xajaxResponse('utf-8'); $direccion = remplacetas("empresa","id",$id_empresa,"direccion",""); $telefono = remplacetas("empresa","id",$id_empresa,"telefono",""); $web = remplacetas("empresa","id",$id_empresa,"web",""); - $email = remplacetas("empresa","id",$id_empresa,"email",""); + $email = remplacetas("empresa","id","1","email",""); $imagen = remplacetas("empresa","id",$id_empresa,"imagen",""); $razon_social = remplacetas("empresa","id",$id_empresa,"razon_social",""); $slogan = remplacetas("empresa","id",$id_empresa,"slogan","");