Update src/Module/Admin/Summary.php

[friendica.git] / src / Module / Admin / Summary.php

diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php
index 6244c5c9b6d71271a60bf3e36f837984245613c8..9ca71e33d2487170a9e6f9494b78c44bedf9946b 100644 (file)
--- a/src/Module/Admin/Summary.php
+++ b/src/Module/Admin/Summary.php
@@ -23,15 +23,14 @@ namespace Friendica\Module\Admin;
 
 use Friendica\App;
 use Friendica\Core\Addon;
+use Friendica\Core\Config\Util\ConfigFileManager;
 use Friendica\Core\Config\ValueObject\Cache;
-use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\Update;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Core\Config\Factory\Config;
-use Friendica\Model\Register;
 use Friendica\Module\BaseAdmin;
 use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Network\HTTPException\ServiceUnavailableException;
@@ -80,7 +79,8 @@ class Summary extends BaseAdmin
                // Check if github.com/friendica/stable/VERSION is higher then
                // the local version of Friendica. Check is opt-in, source may be stable or develop branch
                if (DI::config()->get('system', 'check_new_version_url', 'none') != 'none') {
-                       $gitversion = DI::config()->get('system', 'git_friendica_version');
+                       $gitversion = DI::keyValue()->get('git_friendica_version') ?? ''; 
+
                        if (version_compare(App::VERSION, $gitversion) < 0) {
                                $warningtext[] = DI::l10n()->t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', App::VERSION, $gitversion);
                        }
@@ -114,6 +114,10 @@ class Summary extends BaseAdmin
                        $warningtext[] = DI::l10n()->t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from <code>config/local.ini.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', DI::baseUrl()->get() . '/help/Config');
                }
 
+               if (!DI::configFileManager()->dataIsWritable()) {
+                       $warningtext[] = DI::l10n()->t('Friendica\'s configuration store "%s" isn\'t writable. Until then database updates won\'t be applied automatically, admin settings and console configuration changes won\'t be saved.', ConfigFileManager::CONFIG_DATA_FILE);
+               }
+
                // Check server vitality
                if (!self::checkSelfHostMeta()) {
                        $well_known = DI::baseUrl()->get() . Probe::HOST_META;
@@ -154,7 +158,7 @@ class Summary extends BaseAdmin
                }
 
                // check legacy basepath settings
-               $configLoader = (new Config())->createConfigFileLoader($a->getBasePath(), $_SERVER);
+               $configLoader = (new Config())->createConfigFileManager($a->getBasePath(), $_SERVER);
                $configCache = new Cache();
                $configLoader->setupCache($configCache);
                $confBasepath = $configCache->get('system', 'basepath');