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 -- ------------------------------------------ diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index e963e7606d..9ca71e33d2 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/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 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'); +} diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 848fd9ce5a..a5992bdc72 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-22 17:07+0000\n" +"POT-Creation-Date: 2023-01-23 06:41+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -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 "" @@ -9478,8 +9478,8 @@ msgstr "" #: src/Module/Settings/Connectors.php:223 msgid "" "When activated, the \"spoiler_text\" field in the API will be used for the " -"title on staring posts. When deactivated it will be used for spoiler text. " -"For comments it will be used for spoiler text in any case." +"title on standalone posts. When deactivated it will be used for spoiler " +"text. For comments it will be always be used for spoiler text." msgstr "" #: src/Module/Settings/Connectors.php:224