Download | Plain Text | No Line Numbers 

  1. diff -aur orig/email_autoresponder.php /var/www/confixx/html/user/email_autoresponder.php
  2. --- orig/email_autoresponder.php	2006-07-01 15:16:25.000000000 +0200
  3. +++ /var/www/confixx/html/user/email_autoresponder.php	2006-07-01 15:14:03.000000000 +0200
  4. @@ -34,7 +34,7 @@
  5.  $werte = db_fetch_array($id);
  6.  $autoresponder = $werte["autoresponder"];
  7.  
  8. -$id3 = safe_query( "select kunde from email where kunde = ? ", TRUE, new SQLString( $PHP_AUTH_USER ) );
  9. +$id3 = safe_query( "select kunde from email where kunde = ? and prefix!='*'", TRUE, new SQLString( $PHP_AUTH_USER ) );
  10.  $anzahlemailadressen = db_num_rows($id3);
  11.  
  12.  /* -------------------- HTML -------------------- */
  13. @@ -54,6 +54,8 @@
  14.  	}
  15.  	$id = safe_query( "select prefix, domain, ident from email where kunde = ?  order by prefix, domain", TRUE, new SQLString( $PHP_AUTH_USER ) );
  16.  	while ($werte = db_fetch_array($id)) {
  17. +		if ($werte["prefix"] == "*")
  18. +		  continue;
  19.  		$emailadresse = $werte["prefix"]."@".$werte["domain"];
  20.  		$ident = $werte["ident"];
  21.  		if (ereg("\[".$ident."\]", $autoresponderliste)) {
  22. @@ -73,4 +75,4 @@
  23.  /* -------------------- end HTML -------------------- */
  24.  
  25.  db_close();
  26. -?>
  27. \ No newline at end of file
  28. +?>
  29. diff -aur orig/email_email_anlegen2.php /var/www/confixx/html/user/email_email_anlegen2.php
  30. --- orig/email_email_anlegen2.php	2006-07-01 16:05:25.000000000 +0200
  31. +++ /var/www/confixx/html/user/email_email_anlegen2.php	2006-07-01 16:43:50.000000000 +0200
  32. @@ -80,6 +80,14 @@
  33.  }
  34.  ## //
  35.  
  36. +if ($prefix == "*") {
  37. +	$fehlertext = "CatchAll accounts can't be forwarded. - CatchAll-Konten können nicht weitergeleitet werden.";
  38. +	db_close();
  39. +	popPathBar();
  40. +	include( "email_email.php" );
  41. +	exit();
  42. +}
  43. +
  44.  ## prefix auf syntax pr�fen
  45.  if ($prefix != "*") {
  46.  	if ((!ereg("^[a-z0-9]",$prefix)) || (!ereg("[a-z0-9]$", $prefix)) || (ereg("([^a-z0-9_.-])|([.]{2})", $prefix))) {
  47. diff -aur orig/email_email_bearbeiten.php /var/www/confixx/html/user/email_email_bearbeiten.php
  48. --- orig/email_email_bearbeiten.php	2006-07-01 16:41:35.000000000 +0200
  49. +++ /var/www/confixx/html/user/email_email_bearbeiten.php	2006-07-01 16:40:55.000000000 +0200
  50. @@ -136,15 +136,17 @@
  51.  $mainrec_header->SetColSpan("2");
  52.  $data->AppendHeaderRow( $mainrec_header );
  53.  
  54. -$data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
  55. -																				$htyp,
  56. -																				"htyp",
  57. -																				cc_RadioGroupPresentation
  58. -																				), 
  59. -									new TextDataField( $htyp==1?$hpop3:"", 
  60. -																		 "hemail" 
  61. -																		 ) 
  62. -									);
  63. +if (substr($emailadresse, 0, 1) != "*") {
  64. +	$data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
  65. +																					$htyp,
  66. +																					"htyp",
  67. +																					cc_RadioGroupPresentation
  68. +																					), 
  69. +										new TextDataField( $htyp==1?$hpop3:"", 
  70. +																			 "hemail" 
  71. +																			 ) 
  72. +										);
  73. +}
  74.  
  75.  for ($pops = 0; $pops < count($allpops); $pops++) {
  76.  	 $account = $allpops[$pops];
  77. @@ -172,15 +174,17 @@
  78.  	$recipient_header->SetColSpan("2");
  79.  	$data->AppendHeaderRow( $recipient_header );
  80.  
  81. -	$data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
  82. -																					$typs[$i],
  83. -																					'typs['.$i.']', /* name */
  84. -																					cc_RadioGroupPresentation 
  85. -																					), 
  86. -										new TextDataField( $typs[$i]==1?$pop3s[$x]:"", 
  87. -																			 'emails['.$i.']' /* name */
  88. -																			 ) 
  89. -										);
  90. +	if (substr($emailadresse, 0, 1) != "*") {
  91. +		$data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
  92. +																						$typs[$i],
  93. +																						'typs['.$i.']', /* name */
  94. +																						cc_RadioGroupPresentation 
  95. +																						), 
  96. +											new TextDataField( $typs[$i]==1?$pop3s[$x]:"", 
  97. +																				 'emails['.$i.']' /* name */
  98. +																				 ) 
  99. +											);
  100. +	}
  101.  
  102.  
  103.  	$data->AppendRow( new OptionsDataField( array( "0" => ltext("emembe_cell_save")),
  104. @@ -202,4 +206,4 @@
  105.  /* -------------------- end HTML -------------------- */
  106.  
  107.  db_close();
  108. -?>
  109. \ No newline at end of file
  110. +?>
  111.