Various typos and tabs adjustments
Replace php_sapi_name() function with PHP_SAPI constant

exact same behavior but faster, shorter
Merge pull request #2586 from vlakoff/develop

Various typos and tabs adjustments
An improved version of PR #2584, fixes #2583