Download | Plain Text | No Line Numbers 

  1. --- html.orig/user/email_autoresponder.php	2007-04-30 14:09:27.000000000 +0200
  2. +++ html/user/email_autoresponder.php	2007-04-30 14:49:24.000000000 +0200
  3. @@ -47,7 +47,7 @@
  4.  list( $autoresponder ) = db_fetch_array( $id, 'N' );
  5.  db_free_query( $id );
  6.  
  7. -$id3 = safe_query2( "SELECT COUNT(kunde) FROM email WHERE kunde = ? AND server_id='$ServerID'", 
  8. +$id3 = safe_query2( "SELECT COUNT(kunde) FROM email WHERE kunde = ? AND prefix!='*' AND server_id='$ServerID'", 
  9.                    $loUser );
  10.  list($anzahlemailadressen) = db_fetch_array( $id3, 'N' );
  11.  db_free_query( $id3 );
  12. @@ -74,6 +74,8 @@
  13.  	                 $loUser );
  14.    $emails_list = array();
  15.  	while( $werte = db_fetch_array( $id ) ){
  16. +		if ($werte["prefix"] == "*")
  17. +			continue;
  18.  		$emailadresse = $werte["prefix"]."@".$werte["domain"];
  19.  		$ident = $werte["ident"];
  20.  		if (ereg("\[".$ident."\]", $autoresponderliste)) {
  21. @@ -95,4 +97,4 @@
  22.  /* -------------------- end HTML -------------------- */
  23.  
  24.  db_close();
  25. -?>
  26. \ No newline at end of file
  27. +?>
  28. --- html.orig/user/email_email_anlegen2.php	2007-04-30 14:09:27.000000000 +0200
  29. +++ html/user/email_email_anlegen2.php	2007-04-30 14:51:59.000000000 +0200
  30. @@ -105,6 +105,14 @@
  31.  	exit();
  32.  }
  33.  
  34. +if ($prefix == "*") {
  35. +	$fehlertext = "CatchAll accounts can't be forwarded. - CatchAll-Konten können nicht weitergeleitet werden.";
  36. +	db_close();
  37. +	popPathBar();
  38. +	include("email_email.php");
  39. +	exit();
  40. +}
  41. +
  42.  /**
  43.   * Prefix syntax checks
  44.   */
  45. --- html.orig/user/email_email_bearbeiten.php	2007-04-30 14:09:27.000000000 +0200
  46. +++ html/user/email_email_bearbeiten.php	2007-04-30 14:55:44.000000000 +0200
  47. @@ -149,15 +149,18 @@
  48.  $mainrec_header->SetColSpan("2");
  49.  $data->AppendHeaderRow( $mainrec_header );
  50.  
  51. -$data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
  52. -																				$htyp,
  53. -																				"htyp",
  54. -																				cc_RadioGroupPresentation
  55. -																				), 
  56. -									new TextDataField( $htyp==1?$hpop3:"", 
  57. -																		 "hemail" 
  58. -																		 ) 
  59. -									);
  60. +if (substr($emailadresse, 0, 1) != "*") {
  61. +	$data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
  62. +																					$htyp,
  63. +																					"htyp",
  64. +																					cc_RadioGroupPresentation
  65. +																					), 
  66. +										new TextDataField( $htyp==1?$hpop3:"", 
  67. +																			 "hemail" 
  68. +																			 ) 
  69. +										);
  70. +}
  71. +
  72.  $account_list = array();
  73.  for ($pops = 0; $pops < count($allpops); $pops++) {
  74.  	 $account = $allpops[$pops];
  75. @@ -185,15 +188,17 @@
  76.  	$recipient_header->SetColSpan("2");
  77.  	$data->AppendHeaderRow( $recipient_header );
  78.  
  79. -	$data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
  80. -																					$typs[$i],
  81. -																					'typs['.$i.']', /* name */
  82. -																					cc_RadioGroupPresentation 
  83. -																					), 
  84. -										new TextDataField( $typs[$i]==1?$pop3s[$x]:"", 
  85. -																			 'emails['.$i.']' /* name */
  86. -																			 ) 
  87. -										);
  88. +	if (substr($emailadresse, 0, 1) != "*") {
  89. +		$data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
  90. +																						$typs[$i],
  91. +																						'typs['.$i.']', /* name */
  92. +																						cc_RadioGroupPresentation 
  93. +																						), 
  94. +											new TextDataField( $typs[$i]==1?$pop3s[$x]:"", 
  95. +																				 'emails['.$i.']' /* name */
  96. +																				 ) 
  97. +											);
  98. +	}
  99.  
  100.  
  101.  	$data->AppendRow( new OptionsDataField( array( "0" => ltext("emembe_cell_save")),
  102. @@ -215,4 +220,4 @@
  103.  /* -------------------- end HTML -------------------- */
  104.  
  105.  db_close();
  106. -?>
  107. \ No newline at end of file
  108. +?>
  109.