From 0dfa8f73d8ad826bd6ea61530cdcb65f4eb4cfd0 Mon Sep 17 00:00:00 2001
From: humano <humano@alien.cubil>
Date: Tue, 18 Dec 2018 08:21:32 -0500
Subject: [PATCH] mejorar envio

---
 funciones/funciones.php | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/funciones/funciones.php b/funciones/funciones.php
index fbfb899..54cd903 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:  $email[0] \r\n";
+$headers .= "Reply-To:  <$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
@@ -8318,7 +8325,7 @@ $impresion
 <p>Puede revisar los datos en <a href='$_SESSION[site]I$control'>$_SESSION[site]I$control</a></p>
 <p>Saludos de MILFS</p>
 ";
-			if(mail("$email_envio","$asunto","$cuerpo","$headers")){ $exito .="<strong class='text-suggest'>Se envió un email a $email_envio</strong>"; }else {$exito .="error enviando correo";}
+			if(mail("$email_envio","$asunto","$cuerpo","$headers")){ $exito .="<strong class='text-suggest'>Se envió un email a $email_envio</strong>"; }else {$exito .="error enviando correo <pre>[$id_empresa] ( $email[0] $email[2] ) // $email_envio,$asunto,$headers</pre>";}
 
 $respuesta->addAssign("confirmar_envio_email","innerHTML",$exito);
 return $respuesta;
@@ -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","");