Fix SSL check
Merge branch 'patch-42' of https://github.com/acidvertigo/oscommerce2 into acidvertigo-patch-42

Conflicts:
	catalog/includes/functions/general.php
add global $request_type
Merge branch 'acidvertigo-patch-42'