bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

More configs moved to key values

Browse source
This commit is contained in:
Michael 2023-01-22 13:40:08 +00:00
parent 2db935fae2
commit d76963944a
5 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Core/Config/Model/Config.php
View file

@ -27,6 +27,8 @@ use Friendica\Core\Config\Exception\ConfigFileException;
use Friendica\Core\Config\Exception\ConfigPersistenceException; use Friendica\Core\Config\Exception\ConfigPersistenceException;
use Friendica\Core\Config\Util\ConfigFileManager; use Friendica\Core\Config\Util\ConfigFileManager;
use Friendica\Core\Config\ValueObject\Cache; use Friendica\Core\Config\ValueObject\Cache;
use Friendica\Core\Logger;
use Friendica\Core\System;
/** /**
* Configuration model, which manages the whole system configuration * Configuration model, which manages the whole system configuration
@ -118,6 +120,7 @@ class Config implements IManageConfigValues
/** {@inheritDoc} */ /** {@inheritDoc} */
public function set(string $cat, string $key, $value): bool public function set(string $cat, string $key, $value): bool
{ {
Logger::debug('Set config value', ['cat' => $cat, 'key' => $key, 'value' => $value, 'callstack' => System::callstack(20)]);
if ($this->configCache->set($cat, $key, $value, Cache::SOURCE_DATA)) { if ($this->configCache->set($cat, $key, $value, Cache::SOURCE_DATA)) {
$this->save(); $this->save();
return true; return true;

3
src/Module/Admin/Summary.php
View file

@ -79,7 +79,8 @@ class Summary extends BaseAdmin
// Check if github.com/friendica/stable/VERSION is higher then // 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 // 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') { 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) { 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); $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);
} }

2
src/Worker/CheckVersion.php
View file

@ -58,7 +58,7 @@ class CheckVersion
$gitversion = DBA::escape(trim(DI::httpClient()->fetch($checked_url, HttpClientAccept::TEXT))); $gitversion = DBA::escape(trim(DI::httpClient()->fetch($checked_url, HttpClientAccept::TEXT)));
Logger::notice("Upstream VERSION is: ".$gitversion); Logger::notice("Upstream VERSION is: ".$gitversion);
DI::config()->set('system', 'git_friendica_version', $gitversion); DI::keyValue()->set('git_friendica_version', $gitversion);
Logger::notice('checkversion: end'); Logger::notice('checkversion: end');

2
static/dbstructure.config.php
View file

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1512); define('DB_UPDATE_VERSION', 1513);
} }
return [ return [

9
update.php
View file

@ -1244,3 +1244,12 @@ function update_1512()
DI::config()->delete('nodeinfo', 'local_posts'); DI::config()->delete('nodeinfo', 'local_posts');
DI::config()->delete('nodeinfo', 'local_comments'); DI::config()->delete('nodeinfo', 'local_comments');
} }
function update_1513()
{
DI::keyValue()->set('git_friendica_version', DI::config()->get('system', 'git_friendica_version'));
DI::keyValue()->set('twitter_application_name', DI::config()->get('twitter', 'application_name'));
DI::config()->delete('system', 'git_friendica_version');
DI::config()->delete('twitter', 'application_name');
}