always try the "catch-all" test for the domain + replace deprecated ereg
Merge branch 'catchalls-always'