From d76963944ad886cfc73183e3c0624627b89662eb Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Jan 2023 13:40:08 +0000 Subject: [PATCH 1/6] More configs moved to key values --- src/Core/Config/Model/Config.php | 3 +++ src/Module/Admin/Summary.php | 3 ++- src/Worker/CheckVersion.php | 2 +- static/dbstructure.config.php | 2 +- update.php | 9 +++++++++ 5 files changed, 16 insertions(+), 3 deletions(-) diff --git a/src/Core/Config/Model/Config.php b/src/Core/Config/Model/Config.php index 46d5643b34..0a242c8587 100644 --- a/src/Core/Config/Model/Config.php +++ b/src/Core/Config/Model/Config.php @@ -27,6 +27,8 @@ use Friendica\Core\Config\Exception\ConfigFileException; use Friendica\Core\Config\Exception\ConfigPersistenceException; use Friendica\Core\Config\Util\ConfigFileManager; use Friendica\Core\Config\ValueObject\Cache; +use Friendica\Core\Logger; +use Friendica\Core\System; /** * Configuration model, which manages the whole system configuration @@ -118,6 +120,7 @@ class Config implements IManageConfigValues /** {@inheritDoc} */ 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)) { $this->save(); return true; diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index e963e7606d..f9c8cefbb6 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -79,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); } diff --git a/src/Worker/CheckVersion.php b/src/Worker/CheckVersion.php index 6676e51127..f4c45fe33d 100644 --- a/src/Worker/CheckVersion.php +++ b/src/Worker/CheckVersion.php @@ -58,7 +58,7 @@ class CheckVersion $gitversion = DBA::escape(trim(DI::httpClient()->fetch($checked_url, HttpClientAccept::TEXT))); 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'); diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index 4329410b4a..9dfd7820c1 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -55,7 +55,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1512); + define('DB_UPDATE_VERSION', 1513); } return [ diff --git a/update.php b/update.php index 8f93775259..7d9a9d2363 100644 --- a/update.php +++ b/update.php @@ -1244,3 +1244,12 @@ function update_1512() DI::config()->delete('nodeinfo', 'local_posts'); 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'); +} From 70d942bd8b8807e1d0911b00e17251cec473e813 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Jan 2023 13:47:33 +0000 Subject: [PATCH 2/6] Updated database.sql --- database.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database.sql b/database.sql index 0b91aedc06..843db1f6cf 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2023.03-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1512 +-- DB_UPDATE_VERSION 1513 -- ------------------------------------------ From 415e592886da235bc8ea251cecbea08cf8a234a4 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Jan 2023 13:58:28 +0000 Subject: [PATCH 3/6] Debug message removed --- src/Core/Config/Model/Config.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Core/Config/Model/Config.php b/src/Core/Config/Model/Config.php index 0a242c8587..46d5643b34 100644 --- a/src/Core/Config/Model/Config.php +++ b/src/Core/Config/Model/Config.php @@ -27,8 +27,6 @@ use Friendica\Core\Config\Exception\ConfigFileException; use Friendica\Core\Config\Exception\ConfigPersistenceException; use Friendica\Core\Config\Util\ConfigFileManager; use Friendica\Core\Config\ValueObject\Cache; -use Friendica\Core\Logger; -use Friendica\Core\System; /** * Configuration model, which manages the whole system configuration @@ -120,7 +118,6 @@ class Config implements IManageConfigValues /** {@inheritDoc} */ 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)) { $this->save(); return true; From 575fb524385231961ebb49654eab0cb5d0ed2a49 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 22 Jan 2023 14:44:57 +0000 Subject: [PATCH 4/6] Fetch data from basic auth when one of the parameters is missing --- src/Module/OAuth/Token.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/OAuth/Token.php b/src/Module/OAuth/Token.php index 6f68215cc6..ecb65048d0 100644 --- a/src/Module/OAuth/Token.php +++ b/src/Module/OAuth/Token.php @@ -60,7 +60,7 @@ class Token extends BaseApi $authorization = $_SERVER['REDIRECT_REMOTE_USER'] ?? ''; } - if (empty($request['client_id']) && substr($authorization, 0, 6) == 'Basic ') { + if ((empty($request['client_id']) || empty($request['client_secret'])) && substr($authorization, 0, 6) == 'Basic ') { // Per RFC2617, usernames can't contain a colon but password can, // so we cut on the first colon to obtain the username and the password // @see https://www.rfc-editor.org/rfc/rfc2617#section-2 From 9e9aa4b108d3bbfc16f51d56fd03957516b28715 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Sun, 22 Jan 2023 21:35:24 +0100 Subject: [PATCH 5/6] Update src/Module/Admin/Summary.php Co-authored-by: Hypolite Petovan --- src/Module/Admin/Summary.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index f9c8cefbb6..9ca71e33d2 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -79,7 +79,7 @@ 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::keyValue()->get('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); From 557553a856f458c53e5e57d76d07392c6d6c6dd8 Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 23 Jan 2023 06:37:45 +0000 Subject: [PATCH 6/6] Updated messages.po --- view/lang/C/messages.po | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 7634bc8e87..24ccd012ae 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2023.03-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-01-21 09:22-0500\n" +"POT-Creation-Date: 2023-01-23 06:36+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -653,7 +653,7 @@ msgstr "" msgid "No system theme config value set." msgstr "" -#: src/App.php:592 +#: src/App.php:573 msgid "Apologies but the website is unavailable at the moment." msgstr "" @@ -3296,7 +3296,7 @@ msgstr "" msgid "Title/Description:" msgstr "" -#: src/Model/Profile.php:1023 src/Module/Admin/Summary.php:220 +#: src/Model/Profile.php:1023 src/Module/Admin/Summary.php:221 #: src/Module/Moderation/Summary.php:77 msgid "Summary" msgstr "" @@ -3623,7 +3623,7 @@ msgstr "" #: src/Module/Admin/Federation.php:207 src/Module/Admin/Logs/Settings.php:79 #: src/Module/Admin/Logs/View.php:84 src/Module/Admin/Queue.php:72 #: src/Module/Admin/Site.php:435 src/Module/Admin/Storage.php:138 -#: src/Module/Admin/Summary.php:219 src/Module/Admin/Themes/Details.php:90 +#: src/Module/Admin/Summary.php:220 src/Module/Admin/Themes/Details.php:90 #: src/Module/Admin/Themes/Index.php:111 src/Module/Admin/Tos.php:77 #: src/Module/Moderation/Users/Create.php:61 #: src/Module/Moderation/Users/Pending.php:96 @@ -5041,39 +5041,39 @@ msgid "" "to %d. See here for more information.
" msgstr "" -#: src/Module/Admin/Summary.php:84 +#: src/Module/Admin/Summary.php:85 #, php-format msgid "" "There is a new version of Friendica available for download. Your current " "version is %1$s, upstream version is %2$s" msgstr "" -#: src/Module/Admin/Summary.php:93 +#: src/Module/Admin/Summary.php:94 msgid "" "The database update failed. Please run \"php bin/console.php dbstructure " "update\" from the command line and have a look at the errors that might " "appear." msgstr "" -#: src/Module/Admin/Summary.php:97 +#: src/Module/Admin/Summary.php:98 msgid "" "The last update failed. Please run \"php bin/console.php dbstructure update" "\" from the command line and have a look at the errors that might appear. " "(Some of the errors are possibly inside the logfile.)" msgstr "" -#: src/Module/Admin/Summary.php:102 +#: src/Module/Admin/Summary.php:103 msgid "The worker was never executed. Please check your database structure!" msgstr "" -#: src/Module/Admin/Summary.php:104 +#: src/Module/Admin/Summary.php:105 #, php-format msgid "" "The last worker execution was on %s UTC. This is older than one hour. Please " "check your crontab settings." msgstr "" -#: src/Module/Admin/Summary.php:109 +#: src/Module/Admin/Summary.php:110 #, php-format msgid "" "Friendica's configuration now is stored in config/local.config.php, please " @@ -5082,7 +5082,7 @@ msgid "" "with the transition." msgstr "" -#: src/Module/Admin/Summary.php:113 +#: src/Module/Admin/Summary.php:114 #, php-format msgid "" "Friendica's configuration now is stored in config/local.config.php, please " @@ -5091,7 +5091,7 @@ msgid "" "with the transition." msgstr "" -#: src/Module/Admin/Summary.php:117 +#: src/Module/Admin/Summary.php:118 #, php-format msgid "" "Friendica's configuration store \"%s\" isn't writable. Until then database " @@ -5099,7 +5099,7 @@ msgid "" "configuration changes won't be saved." msgstr "" -#: src/Module/Admin/Summary.php:123 +#: src/Module/Admin/Summary.php:124 #, php-format msgid "" "%s is not reachable on your system. This is a severe " @@ -5107,50 +5107,50 @@ msgid "" "href=\"%s\">the installation page for help." msgstr "" -#: src/Module/Admin/Summary.php:141 +#: src/Module/Admin/Summary.php:142 #, php-format msgid "The logfile '%s' is not usable. No logging possible (error: '%s')" msgstr "" -#: src/Module/Admin/Summary.php:155 +#: src/Module/Admin/Summary.php:156 #, php-format msgid "The debug logfile '%s' is not usable. No logging possible (error: '%s')" msgstr "" -#: src/Module/Admin/Summary.php:171 +#: src/Module/Admin/Summary.php:172 #, php-format msgid "" "Friendica's system.basepath was updated from '%s' to '%s'. Please remove the " "system.basepath from your db to avoid differences." msgstr "" -#: src/Module/Admin/Summary.php:179 +#: src/Module/Admin/Summary.php:180 #, php-format msgid "" "Friendica's current system.basepath '%s' is wrong and the config file '%s' " "isn't used." msgstr "" -#: src/Module/Admin/Summary.php:187 +#: src/Module/Admin/Summary.php:188 #, php-format msgid "" "Friendica's current system.basepath '%s' is not equal to the config file " "'%s'. Please fix your configuration." msgstr "" -#: src/Module/Admin/Summary.php:198 +#: src/Module/Admin/Summary.php:199 msgid "Message queues" msgstr "" -#: src/Module/Admin/Summary.php:204 +#: src/Module/Admin/Summary.php:205 msgid "Server Settings" msgstr "" -#: src/Module/Admin/Summary.php:222 +#: src/Module/Admin/Summary.php:223 msgid "Version" msgstr "" -#: src/Module/Admin/Summary.php:226 +#: src/Module/Admin/Summary.php:227 msgid "Active addons" msgstr ""