Download | Plain Text | Line Numbers
--- html.orig/user/email_autoresponder.php 2007-04-30 14:09:27.000000000 +0200
+++ html/user/email_autoresponder.php 2007-04-30 14:49:24.000000000 +0200
@@ -47,7 +47,7 @@
list( $autoresponder ) = db_fetch_array( $id, 'N' );
db_free_query( $id );
-$id3 = safe_query2( "SELECT COUNT(kunde) FROM email WHERE kunde = ? AND server_id='$ServerID'",
+$id3 = safe_query2( "SELECT COUNT(kunde) FROM email WHERE kunde = ? AND prefix!='*' AND server_id='$ServerID'",
$loUser );
list($anzahlemailadressen) = db_fetch_array( $id3, 'N' );
db_free_query( $id3 );
@@ -74,6 +74,8 @@
$loUser );
$emails_list = array();
while( $werte = db_fetch_array( $id ) ){
+ if ($werte["prefix"] == "*")
+ continue;
$emailadresse = $werte["prefix"]."@".$werte["domain"];
$ident = $werte["ident"];
if (ereg("\[".$ident."\]", $autoresponderliste)) {
@@ -95,4 +97,4 @@
/* -------------------- end HTML -------------------- */
db_close();
-?>
\ No newline at end of file
+?>
--- html.orig/user/email_email_anlegen2.php 2007-04-30 14:09:27.000000000 +0200
+++ html/user/email_email_anlegen2.php 2007-04-30 14:51:59.000000000 +0200
@@ -105,6 +105,14 @@
exit();
}
+if ($prefix == "*") {
+ $fehlertext = "CatchAll accounts can't be forwarded. - CatchAll-Konten können nicht weitergeleitet werden.";
+ db_close();
+ popPathBar();
+ include("email_email.php");
+ exit();
+}
+
/**
* Prefix syntax checks
*/
--- html.orig/user/email_email_bearbeiten.php 2007-04-30 14:09:27.000000000 +0200
+++ html/user/email_email_bearbeiten.php 2007-04-30 14:55:44.000000000 +0200
@@ -149,15 +149,18 @@
$mainrec_header->SetColSpan("2");
$data->AppendHeaderRow( $mainrec_header );
-$data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
- $htyp,
- "htyp",
- cc_RadioGroupPresentation
- ),
- new TextDataField( $htyp==1?$hpop3:"",
- "hemail"
- )
- );
+if (substr($emailadresse, 0, 1) != "*") {
+ $data->AppendRow( new OptionsDataField( array("1"=>ltext("emembe_cell_redirect")),
+ $htyp,
+ "htyp",
+ cc_RadioGroupPresentation
+ ),
+ new TextDataField( $htyp==1?$hpop3:"",
+ "hemail"
+ )
+ );
+}
+
$account_list = array();
for ($pops = 0; $pops < count($allpops); $pops++) {
$account = $allpops[$pops];
@@ -185,15 +188,17 @@
$recipient_header->SetColSpan("2");
$data->AppendHeaderRow( $recipient_header );
- $data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
- $typs[$i],
- 'typs['.$i.']', /* name */
- cc_RadioGroupPresentation
- ),
- new TextDataField( $typs[$i]==1?$pop3s[$x]:"",
- 'emails['.$i.']' /* name */
- )
- );
+ if (substr($emailadresse, 0, 1) != "*") {
+ $data->AppendRow( new OptionsDataField( array( "1" => ltext("emembe_cell_redirect") ),
+ $typs[$i],
+ 'typs['.$i.']', /* name */
+ cc_RadioGroupPresentation
+ ),
+ new TextDataField( $typs[$i]==1?$pop3s[$x]:"",
+ 'emails['.$i.']' /* name */
+ )
+ );
+ }
$data->AppendRow( new OptionsDataField( array( "0" => ltext("emembe_cell_save")),
@@ -215,4 +220,4 @@
/* -------------------- end HTML -------------------- */
db_close();
-?>
\ No newline at end of file
+?>