Skip to content

Commit

Permalink
Revert "Also include *.config.php files"
Browse files Browse the repository at this point in the history
  • Loading branch information
@come-nc
come-nc authored Mar 14, 2024
1 parent 5587899 commit 76d6a56
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 50 deletions.
31 changes: 6 additions & 25 deletions index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,36 +79,17 @@ public function __construct(string $baseDir) {
$this->baseDir = $baseDir;

if ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
$configDir = rtrim($dir, '/');
$configFileName = rtrim($dir, '/') . '/config.php';
} else {
$configDir = $this->baseDir . '/../config';
$configFileName = $this->baseDir . '/../config/config.php';
}

$configFiles = [$configDir . '/config.php'];

if (!file_exists($configFiles[0])) {
if (!file_exists($configFileName)) {
throw new \Exception('Could not find config.php. Is this file in the "updater" subfolder of Nextcloud?');
}

$extraConfigFiles = glob($configDir . '/*.config.php');
if (is_array($extraConfigFiles)) {
natsort($extraConfigFiles);
$configFiles = array_merge($configFiles, $extraConfigFiles);
}

foreach ($configFiles as $configFile) {
/**
* @psalm-suppress UnresolvableInclude
* @var mixed $CONFIG
*/
require_once $configFile;

if (isset($CONFIG) && is_array($CONFIG)) {
$this->configValues = array_merge($this->configValues, $CONFIG);
}

unset($CONFIG);
}
/** @var array $CONFIG */
require_once $configFileName;
$this->configValues = $CONFIG;

if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) {
// updater disabled
Expand Down
31 changes: 6 additions & 25 deletions lib/Updater.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,36 +41,17 @@ public function __construct(string $baseDir) {
$this->baseDir = $baseDir;

if ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
$configDir = rtrim($dir, '/');
$configFileName = rtrim($dir, '/') . '/config.php';
} else {
$configDir = $this->baseDir . '/../config';
$configFileName = $this->baseDir . '/../config/config.php';
}

$configFiles = [$configDir . '/config.php'];

if (!file_exists($configFiles[0])) {
if (!file_exists($configFileName)) {
throw new \Exception('Could not find config.php. Is this file in the "updater" subfolder of Nextcloud?');
}

$extraConfigFiles = glob($configDir . '/*.config.php');
if (is_array($extraConfigFiles)) {
natsort($extraConfigFiles);
$configFiles = array_merge($configFiles, $extraConfigFiles);
}

foreach ($configFiles as $configFile) {
/**
* @psalm-suppress UnresolvableInclude
* @var mixed $CONFIG
*/
require_once $configFile;

if (isset($CONFIG) && is_array($CONFIG)) {
$this->configValues = array_merge($this->configValues, $CONFIG);
}

unset($CONFIG);
}
/** @var array $CONFIG */
require_once $configFileName;
$this->configValues = $CONFIG;

if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) {
// updater disabled
Expand Down
Binary file modified updater.phar
View file
Binary file not shown.

0 comments on commit 76d6a56

Please sign in to comment.