bug-fix

- misuse of needle/haystack args in strpos calls
- use strpos instead of preg_match : performance