Download | Plain Text | No Line Numbers 

  1. --- html/user/email_email_anlegen2.php.orig	2010-05-24 16:44:08.000000000 +0200
  2. +++ html/user/email_email_anlegen2.php	2010-05-24 19:59:04.000000000 +0200
  3. @@ -181,14 +181,15 @@
  4.  $teil1 = $emailteile[0];
  5.  $teil2 = $emailteile[1];
  6.  
  7. -$id = safe_query2( "SELECT COUNT(*) FROM email WHERE prefix = ? AND domain = ? AND kunde = ? AND server_id='$ServerID'",
  8. -									 new SQLString( $teil1 ), 
  9. -                   new SQLString( $teil2 ), 
  10. -                   $loUser );
  11. -list($count) = db_fetch_array( $id, 'N' );
  12. -
  13. -if ( $count || ($pop3 == "$prefix@$domain")){
  14. -	$fehlertext = ltext("ememan2_error6");
  15. +/* check for mail loops */
  16. +$loops = email_checkloop($prefix, $domain, $teil1, $teil2, $loUser, $ServerID);
  17. +if (!empty($loops))
  18. +{
  19. +	$fehlertext = ltextud('mailloop', $prefix.'@'.$domain . " &rarr; " . $teil1.'@'.$teil2) . "<br />\n";
  20. +	$fehlertext .= "<pre>";
  21. +	foreach($loops as $loop)
  22. +		$fehlertext .= implode(" &rarr; ", $loop) . "\n";
  23. +	$fehlertext .= "</pre>";
  24.  	db_close();
  25.  	popPathBar();
  26.  	include("email_email.php");
  27. --- html/user/email_email_bearbeiten2.php.orig	2010-05-24 19:22:44.000000000 +0200
  28. +++ html/user/email_email_bearbeiten2.php	2010-05-24 20:00:50.000000000 +0200
  29. @@ -73,10 +73,16 @@
  30.  	 $emailteile = explode("@", $hpop3);
  31.  	 $teil1 = $emailteile[0];
  32.  	 $teil2 = $emailteile[1];
  33. -	 $tmpmail = $teil1."@".$teil2;
  34. -	 if (in_array( $tmpmail, $hasEmails ) )	{
  35. -		 $fehlertext = ltext("emembe2_error1");
  36. -		 $pop3 = $hemail;
  37. +	 /* check for mail loops */
  38. +	 $source = explode("@", $emailadresse);
  39. +	 $loops = email_checkloop($source[0], $source[1], $teil1, $teil2, $loUser, $ServerID);
  40. +	 if (!empty($loops))
  41. +	 {
  42. +		 $fehlertext = ltextud('mailloop', $emailadresse . " &rarr; " . $teil1.'@'.$teil2) . "<br />\n";
  43. +		 $fehlertext .= "<pre>";
  44. +		 foreach($loops as $loop)
  45. +			$fehlertext .= implode(" &rarr; ", $loop) . "\n";
  46. +		 $fehlertext .= "</pre>";
  47.  		 db_close();
  48.  		 include("email_email_bearbeiten.php");
  49.  		 exit();
  50. @@ -126,10 +132,19 @@
  51.  			 $emailteile = explode("@", $pop3);
  52.  			 $teil1 = $emailteile[0];
  53.  			 $teil2 = $emailteile[1];
  54. -			 $tmpmail = $teil1."@".$teil2;
  55. -			 if ( in_array( $tmpmail, $hasEmails ) ) {
  56. -				 $pop3 = "";
  57. -				 $topop = "ja";
  58. +			 /* check for mail loops */
  59. +			 $source = explode("@", $emailadresse);
  60. +			 $loops = email_checkloop($source[0], $source[1], $teil1, $teil2, $loUser, $ServerID);
  61. +			 if (!empty($loops))
  62. +			 {
  63. +				 $fehlertext = ltextud('mailloop', $emailadresse . " &rarr; " . $teil1.'@'.$teil2) . "<br />\n";
  64. +				 $fehlertext .= "<pre>";
  65. +				 foreach($loops as $loop)
  66. +					$fehlertext .= implode(" &rarr; ", $loop) . "\n";
  67. +				 $fehlertext .= "</pre>";
  68. +				 db_close();
  69. +				 include("email_email_bearbeiten.php");
  70. +				 exit();
  71.  			 }
  72.  		 }
  73.  
  74.