Fixed: FS#1985 - fetchmail repeated retrieval of emails

tbrehm

2012-01-23 215655af18b82fed7c13881118ea7d7da8ea44c1

Fixed: FS#1985 - fetchmail repeated retrieval of emails

 interface/web/mail/lib/lang/en_mail_get.lng

@@ -14,4 +14,5 @@
$wb["source_password_error_isempty"] = 'Password is empty.';
$wb["destination_error_isemail"] = 'No destination selected.';
$wb["source_server_error_regex"] = 'Pop3/Imap Server is not a valid domain name.';
$wb["error_delete_read_all_combination"] = 'Illegal combination of options. You can not use "Delete emails after retrieval" = no together with "Retrieve all emails" = yes';
?>

 interface/web/mail/mail_get_edit.php

@@ -85,11 +85,17 @@
            }
        } // end if user is not admin
        
		
        // Set the server ID according to the selected destination
        $tmp = $app->db->queryOneRecord("SELECT server_id FROM mail_user WHERE email = '".$app->db->quote($this->dataRecord["destination"])."'");
        $this->dataRecord["server_id"] = $tmp["server_id"];
        unset($tmp);
        
        //* Check that no illegal combination of options is set
        if((!isset($this->dataRecord['source_delete']) || @$this->dataRecord['source_delete'] == 'n') && $this->dataRecord['source_read_all'] == 'y') {
            $app->tform->errorMessage .= $app->tform->lng('error_delete_read_all_combination')."<br>";
        }
		
        parent::onSubmit();
    }