$PHP_SELF issues
Keep consistency between catalog and admin
Add missing cases
Merge pull request #202 from ajeh/admin-phpself-issues

$PHP_SELF issues