Merge pull request #7887 from jdarwood007/indexCleanup

Index cleanup

.github/workflows/php.yml

@@ -35,6 +35,7 @@ jobs:
         php ./vendor/simplemachines/build-tools/check-eof.php
         php ./vendor/simplemachines/build-tools/check-smf-license.php
         php ./vendor/simplemachines/build-tools/check-smf-languages.php
+        php ./vendor/simplemachines/build-tools/check-smf-index.php
         php ./vendor/simplemachines/build-tools/check-version.php
 
   lint:

Packages/backups/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Packages/index.php

@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Packages directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// 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');
 else
 	exit;
 

Smileys/alienine/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Smileys/fugue/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Smileys/index.php

@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Smileys directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// 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');
 else
 	exit;
 

Sources/Actions/Admin/index.php

@@ -0,0 +1,9 @@
+<?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');
+else
+	exit;
+
+?>

Sources/Actions/Moderation/index.php

@@ -0,0 +1,9 @@
+<?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');
+else
+	exit;
+
+?>

Sources/Actions/Profile/index.php

@@ -0,0 +1,9 @@
+<?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');
+else
+	exit;
+
+?>

Sources/Actions/index.php

@@ -0,0 +1,9 @@
+<?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');
+else
+	exit;
+
+?>

Sources/Cache/APIs/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Cache/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Db/APIs/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Db/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Graphics/Gif/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Graphics/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/PackageManager/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/PersonalMessage/index.php

@@ -0,0 +1,9 @@
+<?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');
+else
+	exit;
+
+?>

Sources/ReCaptcha/RequestMethod/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/ReCaptcha/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Search/APIs/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Search/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Security.php

@@ -349,18 +349,9 @@ public static function secureDirectory(string|array $paths, bool $attachments =
 				$contents = <<<END
 				<?php
 
-				/**
-				 * This file is here solely to protect your $directory_name directory.
-				 */
-
-				// Look for Settings.php....
-				if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-				{
-					// Found it!
-					require(dirname(dirname(__FILE__)) . '/Settings.php');
-					header('location: ' . \$boardurl);
-				}
-				// Can't find it... just forget it.
+				// 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');
 				else
 					exit;
 

Sources/Subscriptions/PayPal/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Subscriptions/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/TOTP/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/Unicode/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/WebFetch/APIs/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/WebFetch/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/index.php

@@ -1,17 +1,8 @@
 <?php
 
-/**
- * This file is here solely to protect your Sources directory.
- */
-
-// Look for Settings.php....
-if (file_exists(dirname(dirname(__FILE__)) . '/Settings.php'))
-{
-	// Found it!
-	require(dirname(dirname(__FILE__)) . '/Settings.php');
-	header('location: ' . $boardurl);
-}
-// Can't find it... just forget it.
+// 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');
 else
 	exit;
 

Sources/minify/data/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;
 

Sources/minify/data/js/index.php

@@ -1,8 +1,8 @@
 <?php
 
 // Try to handle it with the upper level index.php. (it should know what to do.)
-if (file_exists(dirname(dirname(__FILE__)) . '/index.php'))
-	include (dirname(dirname(__FILE__)) . '/index.php');
+if (file_exists(dirname(__DIR__) . '/index.php'))
+	include (dirname(__DIR__) . '/index.php');
 else
 	exit;