Skip to content
This repository was archived by the owner on Nov 18, 2017. It is now read-only.

[TASK] Fix OS detection and use PHP constant for splitting the include_path #2

Open
jacobsenj wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[TASK] Fix OS detection and use PHP constant for splitting the include_path #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad7df4d
Use PHP constant instead of custom code.
May 13, 2013
6d8f0dd
Darwin is not Windows.
May 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions typo3-probe.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,7 @@ public function getStatus() {
*/
protected function checkCurrentDirectoryIsInIncludePath() {
$includePath = ini_get('include_path');
$delimiter = $this->isWindowsOs() ? ';' : ':';
$pathArray = $this->trimExplode($delimiter, $includePath);
$pathArray = $this->trimExplode(PATH_SEPARATOR, $includePath);
if (!in_array('.', $pathArray)) {
$status = new WarningStatus();
$status->setTitle('Current directory (./) is not in include path');
Expand Down Expand Up @@ -1160,7 +1159,7 @@ protected function isValidIp($ip) {
*/
protected function isWindowsOs() {
$windowsOs = FALSE;
if (stristr(PHP_OS, 'darwin') && stristr(PHP_OS, 'win')) {
if (!stristr(PHP_OS, 'darwin') && stristr(PHP_OS, 'win')) {
$windowsOs = TRUE;
}
return $windowsOs;
Expand Down Expand Up @@ -1326,4 +1325,4 @@ function printStatus($statuses) {
<p><strong><a href="https://github.com/7elix/TYPO3-Probe/issues" target="_blank">Report bugs for TYPO3 Probe</a></strong></p>
</footer>
</body>
</html>
</html>