friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

Libravatar: Extend the list of default avatars / make the admin interface work #1053

Merged
annando merged 2 commits from libravatar into 2020.12-rc 2020-12-08 08:26:24 +01:00
Conversation 0 Commits 2 Files changed 3 +26 -61
3 changed files with 26 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libravatar/Services/Libravatar.php
View file

@ -549,6 +549,8 @@ class Services_Libravatar
case 'monsterid': case 'monsterid':
case 'wavatar': case 'wavatar':
case 'retro': case 'retro':
case 'robohash':
case 'pagan':
break; break;
default: default:
$valid = filter_var($url, FILTER_VALIDATE_URL); $valid = filter_var($url, FILTER_VALIDATE_URL);

45
libravatar/lang/C/messages.po
View file

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-02-27 05:01-0500\n" "POT-Creation-Date: 2020-12-08 07:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -17,66 +17,53 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
#: libravatar.php:14 #: libravatar.php:68
msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
msgstr ""
#: libravatar.php:73
msgid "generic profile image" msgid "generic profile image"
msgstr "" msgstr ""
#: libravatar.php:74 #: libravatar.php:69
msgid "random geometric pattern" msgid "random geometric pattern"
msgstr "" msgstr ""
#: libravatar.php:75 #: libravatar.php:70
msgid "monster face" msgid "monster face"
msgstr "" msgstr ""
#: libravatar.php:76 #: libravatar.php:71
msgid "computer generated face" msgid "computer generated face"
msgstr "" msgstr ""
#: libravatar.php:77 #: libravatar.php:72
msgid "retro arcade style face" msgid "retro arcade style face"
msgstr "" msgstr ""
#: libravatar.php:82 #: libravatar.php:73
msgid "Warning" msgid "roboter face"
msgstr "" msgstr ""
#: libravatar.php:83 #: libravatar.php:74
#, php-format msgid "retro adventure game character"
msgid "Your PHP version %s is lower than the required PHP >= 5.3."
msgstr "" msgstr ""
#: libravatar.php:84 #: libravatar.php:78
msgid "This addon is not functional on your server."
msgstr ""
#: libravatar.php:93
msgid "Information" msgid "Information"
msgstr "" msgstr ""
#: libravatar.php:93 #: libravatar.php:78
msgid "" msgid ""
"Gravatar addon is installed. Please disable the Gravatar addon.<br>The " "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
"Libravatar addon will fall back to Gravatar if nothing was found at " "Libravatar addon will fall back to Gravatar if nothing was found at "
"Libravatar." "Libravatar."
msgstr "" msgstr ""
#: libravatar.php:99 #: libravatar.php:83
msgid "Submit" msgid "Save Settings"
msgstr "" msgstr ""
#: libravatar.php:100 #: libravatar.php:84
msgid "Default avatar image" msgid "Default avatar image"
msgstr "" msgstr ""
#: libravatar.php:100 #: libravatar.php:84
msgid "Select default avatar image if none was found. See README" msgid "Select default avatar image if none was found. See README"
msgstr "" msgstr ""
#: libravatar.php:112
msgid "Libravatar settings updated."
msgstr ""

40
libravatar/libravatar.php
View file

@ -7,11 +7,10 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\BaseModule; use Friendica\Core\Addon;
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\Core\Logger; use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Database\DBA;
use Friendica\DI; use Friendica\DI;
use Friendica\Util\ConfigFileLoader; use Friendica\Util\ConfigFileLoader;
use Friendica\Util\Strings; use Friendica\Util\Strings;
@ -23,7 +22,7 @@ function libravatar_install()
{ {
Hook::register('load_config', 'addon/libravatar/libravatar.php', 'libravatar_load_config'); Hook::register('load_config', 'addon/libravatar/libravatar.php', 'libravatar_load_config');
Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
Logger::log("registered libravatar in avatar_lookup hook"); Logger::notice("registered libravatar in avatar_lookup hook");
} }
function libravatar_load_config(App $a, ConfigFileLoader $loader) function libravatar_load_config(App $a, ConfigFileLoader $loader)
@ -40,14 +39,9 @@ function libravatar_load_config(App $a, ConfigFileLoader $loader)
function libravatar_lookup($a, &$b) function libravatar_lookup($a, &$b)
{ {
$default_avatar = DI::config()->get('libravatar', 'default_avatar'); $default_avatar = DI::config()->get('libravatar', 'default_avatar');
if (empty($default_avatar)) {
if (! $default_avatar) {
// if not set, look up if there was one from the gravatar addon // if not set, look up if there was one from the gravatar addon
$default_avatar = DI::config()->get('gravatar', 'default_avatar'); $default_avatar = DI::config()->get('gravatar', 'default_avatar', 'identicon');
// setting default avatar if nothing configured
if (!$default_avatar) {
$default_avatar = 'identicon'; // default image will be a random pattern
}
} }
require_once 'Services/Libravatar.php'; require_once 'Services/Libravatar.php';
@ -67,12 +61,7 @@ function libravatar_addon_admin(&$a, &$o)
{ {
$t = Renderer::getMarkupTemplate("admin.tpl", "addon/libravatar"); $t = Renderer::getMarkupTemplate("admin.tpl", "addon/libravatar");
$default_avatar = DI::config()->get('libravatar', 'default_avatar'); $default_avatar = DI::config()->get('libravatar', 'default_avatar', 'identicon');
// set default values for first configuration
if (!$default_avatar) {
$default_avatar = 'identicon'; // pseudo-random geometric pattern based on email hash
}
// Available options for the select boxes // Available options for the select boxes
$default_avatars = [ $default_avatars = [
@ -81,26 +70,15 @@ function libravatar_addon_admin(&$a, &$o)
'monsterid' => DI::l10n()->t('monster face'), 'monsterid' => DI::l10n()->t('monster face'),
'wavatar' => DI::l10n()->t('computer generated face'), 'wavatar' => DI::l10n()->t('computer generated face'),
'retro' => DI::l10n()->t('retro arcade style face'), 'retro' => DI::l10n()->t('retro arcade style face'),
'robohash' => DI::l10n()->t('roboter face'),
'pagan' => DI::l10n()->t('retro adventure game character'),
]; ];
// Show warning if PHP version is too old if (Addon::isEnabled('gravatar')) {
if (! version_compare(PHP_VERSION, '5.3.0', '>=')) {
$o = '<h5>' .DI::l10n()->t('Warning') .'</h5><p>';
$o .= DI::l10n()->t('Your PHP version %s is lower than the required PHP >= 5.3.', PHP_VERSION);
$o .= '<br>' .DI::l10n()->t('This addon is not functional on your server.') .'<p><br>';
return;
}
// Libravatar falls back to gravatar, so show warning about gravatar addon if enabled
$r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
DBA::escape('gravatar')
);
if (count($r)) {
$o = '<h5>' .DI::l10n()->t('Information') .'</h5><p>' .DI::l10n()->t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>'; $o = '<h5>' .DI::l10n()->t('Information') .'</h5><p>' .DI::l10n()->t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
} }
// output Libravatar settings // output Libravatar settings
$o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("libravatarsave") .'">';
$o .= Renderer::replaceMacros( $t, [ $o .= Renderer::replaceMacros( $t, [
'$submit' => DI::l10n()->t('Save Settings'), '$submit' => DI::l10n()->t('Save Settings'),
'$default_avatar' => ['avatar', DI::l10n()->t('Default avatar image'), $default_avatar, DI::l10n()->t('Select default avatar image if none was found. See README'), $default_avatars], '$default_avatar' => ['avatar', DI::l10n()->t('Default avatar image'), $default_avatar, DI::l10n()->t('Select default avatar image if none was found. See README'), $default_avatars],
@ -112,8 +90,6 @@ function libravatar_addon_admin(&$a, &$o)
*/ */
function libravatar_addon_admin_post(&$a) function libravatar_addon_admin_post(&$a)
{ {
BaseModule::checkFormSecurityToken('libravatarrsave');
$default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon'); $default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
DI::config()->set('libravatar', 'default_avatar', $default_avatar); DI::config()->set('libravatar', 'default_avatar', $default_avatar);
} }