Bring settings.php in line with Config.php

Signed by Shawn Bulen, [email protected]
SimpleMachines · Oct 7, 2024 · 7ba18f9 · 7ba18f9
1 parent 187837d
commit 7ba18f9
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 12 deletions.
diff --git a/Sources/Config.php b/Sources/Config.php
@@ -1697,6 +1697,14 @@ public static function updateSettingsFile(array $config_vars, ?bool $keep_quotes
 
 					if (!empty($setting_def['raw_default']) && $setting_def['default'] !== '') {
 						$var_pattern[] = preg_replace('/\s+/', '\s+', preg_quote($setting_def['default'], '~'));
+
+						if (str_contains($setting_def['default'], 'dirname(__FILE__)')) {
+							$var_pattern[] = preg_replace('/\s+/', '\s+', preg_quote(str_replace('dirname(__FILE__)', '__DIR__', $setting_def['default']), '~'));
+						}
+
+						if (str_contains($setting_def['default'], '__DIR__')) {
+							$var_pattern[] = preg_replace('/\s+/', '\s+', preg_quote(str_replace('__DIR__', 'dirname(__FILE__)', $setting_def['default']), '~'));
+						}
 					}
 
 					$var_pattern = array_unique($var_pattern);

diff --git a/other/Settings.php b/other/Settings.php
@@ -173,7 +173,7 @@
  *
  * Path to the cache directory for the file-based cache system.
  */
-$cachedir = dirname(__FILE__) . '/cache';
+$cachedir = __DIR__ . '/cache';
 
 ########## Image Proxy ##########
 /**
@@ -202,25 +202,25 @@
  *
  * The absolute path to the forum's folder. (not just '.'!)
  */
-$boarddir = dirname(__FILE__);
+$boarddir = __DIR__;
 /**
  * @var string
  *
  * Path to the Sources directory.
  */
-$sourcedir = dirname(__FILE__) . '/Sources';
+$sourcedir = __DIR__ . '/Sources';
 /**
  * @var string
  *
  * Path to the Packages directory.
  */
-$packagesdir = dirname(__FILE__) . '/Packages';
+$packagesdir = __DIR__ . '/Packages';
 /**
  * @var string
  *
  * Path to the language directory.
  */
-$languagesdir = dirname(__FILE__) . '/Languages';
+$languagesdir = __DIR__ . '/Languages';
 
 ######### Modification Support #########
 /**
@@ -242,7 +242,7 @@
  */
 $db_character_set = 'utf8';
 
-if (file_exists(dirname(__FILE__) . '/install.php'))
+if (file_exists(__DIR__ . '/install.php'))
 {
 	$secure = false;
 	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')

diff --git a/other/Settings_bak.php b/other/Settings_bak.php
@@ -173,7 +173,7 @@
  *
  * Path to the cache directory for the file-based cache system.
  */
-$cachedir = dirname(__FILE__) . '/cache';
+$cachedir = __DIR__ . '/cache';
 
 ########## Image Proxy ##########
 /**
@@ -202,25 +202,25 @@
  *
  * The absolute path to the forum's folder. (not just '.'!)
  */
-$boarddir = dirname(__FILE__);
+$boarddir = __DIR__;
 /**
  * @var string
  *
  * Path to the Sources directory.
  */
-$sourcedir = dirname(__FILE__) . '/Sources';
+$sourcedir = __DIR__ . '/Sources';
 /**
  * @var string
  *
  * Path to the Packages directory.
  */
-$packagesdir = dirname(__FILE__) . '/Packages';
+$packagesdir = __DIR__ . '/Packages';
 /**
  * @var string
  *
  * Path to the language directory.
  */
-$languagesdir = dirname(__FILE__) . '/Languages';
+$languagesdir = __DIR__ . '/Languages';
 
 ######### Modification Support #########
 /**
@@ -242,7 +242,7 @@
  */
 $db_character_set = 'utf8';
 
-if (file_exists(dirname(__FILE__) . '/install.php'))
+if (file_exists(__DIR__ . '/install.php'))
 {
 	$secure = false;
 	if (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on')