Merge pull request #43 from Sesquipedalian/directory_separator

Sesquipedalian · web-flow · commit 9da3e3163655 · 2025-09-04T18:16:33.000-06:00
Handles DIRECTORY_SEPARATOR correctly in check-smf-index.php
diff --git a/check-smf-index.php b/check-smf-index.php
@@ -21,8 +21,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(__DIR__) . '/index.php')) {
-	include dirname(__DIR__) . '/index.php';
+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {
+	include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';
 } else {
 	exit;
 }
@@ -51,7 +51,7 @@
 			throw new Exception('Index file missing in ' . $currentDirectory);
 		}
 
-		if (file_get_contents($currentDirectory . '/index.php') != $contents) {
+		if (!\in_array(file_get_contents($path . '/index.php'), [$contents, str_replace('DIRECTORY_SEPARATOR . \'index.php\'', '\'/index.php\'', $contents)])) {
 			throw new Exception('Index content does not match in ' . $currentDirectory);
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@`
`21`	`21`	`<?php`
`22`	`22`
`23`	`23`	`// Try to handle it with the upper level index.php. (it should know what to do.)`
`24`		`-if (file_exists(dirname(__DIR__) . '/index.php')) {`
`25`		`- include dirname(__DIR__) . '/index.php';`
	`24`	`+if (file_exists(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php')) {`
	`25`	`+ include dirname(__DIR__) . DIRECTORY_SEPARATOR . 'index.php';`
`26`	`26`	`} else {`
`27`	`27`	`exit;`
`28`	`28`	`}`
`@@ -51,7 +51,7 @@`
`51`	`51`	`throw new Exception('Index file missing in ' . $currentDirectory);`
`52`	`52`	`}`
`53`	`53`
`54`		`- if (file_get_contents($currentDirectory . '/index.php') != $contents) {`
	`54`	`+ if (!\in_array(file_get_contents($path . '/index.php'), [$contents, str_replace('DIRECTORY_SEPARATOR . \'index.php\'', '\'/index.php\'', $contents)])) {`
`55`	`55`	`throw new Exception('Index content does not match in ' . $currentDirectory);`
`56`	`56`	`}`
`57`	`57`	`}`