Fixing basepath issue

diff --git a/config/dbstructure.config.php b/config/dbstructure.config.php
old mode 100644 (file)
new mode 100755 (executable)
index c2bf5c5..0241d1f
--- a/config/dbstructure.config.php
+++ b/config/dbstructure.config.php
@@ -34,7 +34,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1306);
+       define('DB_UPDATE_VERSION', 1307);
 }
 
 return [

diff --git a/src/Core/Update.php b/src/Core/Update.php
index 7cb3212679646bc1dd22af0aa8d4c45fe14343ac..d0521a9041e0197a2a6fa56e68c1914407554b9e 100644 (file)
--- a/src/Core/Update.php
+++ b/src/Core/Update.php
@@ -6,6 +6,7 @@ use Friendica\App;
 use Friendica\Core\Config\Cache\IConfigCache;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
+use Friendica\Util\BasePath;
 use Friendica\Util\Config\ConfigFileLoader;
 use Friendica\Util\Config\ConfigFileSaver;
 use Friendica\Util\Strings;
@@ -235,7 +236,7 @@ class Update
        {
                $configFileLoader = new ConfigFileLoader($basePath, $mode);
                $configCache = new Config\Cache\ConfigCache();
-               $configFileLoader->setupCache($configCache);
+               $configFileLoader->setupCache($configCache, true);
                $configFileSaver = new ConfigFileSaver($basePath);
 
                $updated = false;
@@ -243,10 +244,16 @@ class Update
                if (self::updateConfigEntry($configCache, $configFileSaver,'config', 'hostname')) {
                        $updated = true;
                };
-               if (self::updateConfigEntry($configCache, $configFileSaver,'system', 'basepath')) {
+
+               if (self::updateConfigEntry($configCache, $configFileSaver,'system', 'basepath', BasePath::create(dirname(__DIR__)))) {
                        $updated = true;
                }
 
+               // In case there is nothing to do, skip the update
+               if (!$updated) {
+                       return true;
+               }
+
                if (!$configFileSaver->saveToConfigFile()) {
                        Logger::alert('Config entry update failed - maybe wrong permission?');
                        return false;
@@ -255,7 +262,7 @@ class Update
                DBA::delete('config', ['cat' => 'config', 'k' => 'hostname']);
                DBA::delete('config', ['cat' => 'system', 'k' => 'basepath']);
 
-               return $updated;
+               return true;
        }
 
        /**
@@ -265,12 +272,13 @@ class Update
         * @param ConfigFileSaver $configFileSaver The config file saver
         * @param string          $cat             The config category
         * @param string          $key             The config key
+        * @param string          $default         A default value, if none of the settings are valid
         *
         * @return boolean True, if a value was updated
         *
         * @throws \Exception if DBA or Logger doesn't work
         */
-       private static function updateConfigEntry(IConfigCache $configCache, ConfigFileSaver $configFileSaver, $cat, $key)
+       private static function updateConfigEntry(IConfigCache $configCache, ConfigFileSaver $configFileSaver, $cat, $key, $default = '')
        {
                // check if the config file differs from the whole configuration (= The db contains other values)
                $fileConfig = $configCache->get($cat, $key);
@@ -284,6 +292,9 @@ class Update
                if ($fileConfig !== $savedConfig['v']) {
                        Logger::info('Difference in config found', ['cat' => $cat, 'key' => $key, 'file' => $fileConfig, 'saved' => $savedConfig['v']]);
                        $configFileSaver->addConfigValue($cat, $key, $savedConfig['v']);
+               } elseif (empty($fileConfig) && empty($savedConfig)) {
+                       Logger::info('Using default for config', ['cat' => $cat, 'key' => $key, 'value' => $default]);
+                       $configFileSaver->addConfigValue($cat, $key, $default);
                } else {
                        Logger::info('No Difference in config found', ['cat' => $cat, 'key' => $key, 'value' => $fileConfig, 'saved' => $savedConfig['v']]);
                }

diff --git a/src/Util/Config/ConfigFileLoader.php b/src/Util/Config/ConfigFileLoader.php
index d677d4bfe0c568b49213cfaa34cc6aa30b3caadd..3d4f31a9d1fca798f61cbac072b19ce2fb398825 100644 (file)
--- a/src/Util/Config/ConfigFileLoader.php
+++ b/src/Util/Config/ConfigFileLoader.php
@@ -34,10 +34,11 @@ class ConfigFileLoader extends ConfigFileManager
         * expected local.config.php
         *
         * @param IConfigCache $config The config cache to load to
+        * @param bool         $raw    Setup the raw config format
         *
         * @throws \Exception
         */
-       public function setupCache(IConfigCache $config)
+       public function setupCache(IConfigCache $config, $raw = false)
        {
                $config->load($this->loadCoreConfig('defaults'));
                $config->load($this->loadCoreConfig('settings'));
@@ -48,7 +49,7 @@ class ConfigFileLoader extends ConfigFileManager
                $config->load($this->loadCoreConfig('local'), true);
 
                // In case of install mode, add the found basepath (because there isn't a basepath set yet
-               if ($this->appMode->isInstall()) {
+               if (!$raw && ($this->appMode->isInstall() || empty($config->get('system', 'basepath')))) {
                        // Setting at least the basepath we know
                        $config->set('system', 'basepath', $this->baseDir);
                }

diff --git a/update.php b/update.php
index 8626ed29910dd9e0f519d48a35f98e0728c6784d..0ef74ea00510554d33b80c4c80804bab493cff26 100644 (file)
--- a/update.php
+++ b/update.php
@@ -352,7 +352,7 @@ function update_1298()
  * @see https://github.com/friendica/friendica/pull/6920
  * @return int Success
  */
-function update_1305()
+function update_1307()
 {
        $app = BaseObject::getApp();
        if (Update::saveConfigToFile($app->getBasePath(), $app->getMode())) {