Use strpos instead of strstr as it is faster to...

... check if substring is present
Fix parse error
Merge branch 'master' of https://github.com/acidvertigo/oscommerce2