*/
use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Core\Hook;
use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
use Friendica\Core\Renderer;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Photo;
use Friendica\Network\HTTPException\NotFoundException;
*/
function catavatar_install()
{
- Addon::registerHook('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
- Addon::registerHook('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
- Addon::registerHook('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
+ Hook::register('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
+ Hook::register('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
+ Hook::register('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
Logger::log('registered catavatar');
}
-/**
- * Removes the addon hook
- */
-function catavatar_uninstall()
-{
- Addon::unregisterHook('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
- Addon::unregisterHook('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
- Addon::unregisterHook('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
-
- Logger::log('unregistered catavatar');
-}
-
/**
* Cat avatar user settings page
*/
'$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
'$uncache' => time(),
'$uid' => local_user(),
- '$usecat' => L10n::t('Use Cat as Avatar'),
- '$morecat' => L10n::t('More Random Cat!'),
- '$emailcat' => L10n::t('Reset to email Cat'),
- '$seed' => PConfig::get(local_user(), 'catavatar', 'seed', false),
- '$header' => L10n::t('Cat Avatar Settings'),
+ '$usecat' => DI::l10n()->t('Use Cat as Avatar'),
+ '$morecat' => DI::l10n()->t('More Random Cat!'),
+ '$emailcat' => DI::l10n()->t('Reset to email Cat'),
+ '$seed' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false),
+ '$header' => DI::l10n()->t('Cat Avatar Settings'),
+ '$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'),
]);
}
'account_expired' => false, 'account_removed' => false];
$user = DBA::selectFirst('user', ['email'], $condition);
- $seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
+ $seed = DI::pConfig()->get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
if (!empty($_POST['catavatar-usecat'])) {
- $url = $a->getBaseURL() . '/catavatar/' . local_user() . '?ts=' . time();
+ $url = DI::baseUrl()->get() . '/catavatar/' . local_user() . '?ts=' . time();
$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
if (!DBA::isResult($self)) {
- notice(L10n::t("The cat hadn't found itself."));
+ notice(DI::l10n()->t("The cat hadn't found itself."));
return;
}
$condition = ['uid' => local_user(), 'contact-id' => $self['id']];
$photo = DBA::selectFirst('photo', ['resource-id'], $condition);
if (!DBA::isResult($photo)) {
- notice(L10n::t('There was an error, the cat ran away.'));
+ notice(DI::l10n()->t('There was an error, the cat ran away.'));
return;
}
DBA::update('photo', ['profile' => false], ['profile' => true, 'uid' => local_user()]);
- $fields = ['profile' => true, 'album' => L10n::t('Profile Photos'), 'contact-id' => 0];
+ $fields = ['profile' => true, 'album' => DI::l10n()->t('Profile Photos'), 'contact-id' => 0];
DBA::update('photo', $fields, ['uid' => local_user(), 'resource-id' => $photo['resource-id']]);
Photo::importProfilePhoto($url, local_user(), $self['id']);
Contact::updateSelfFromUserID(local_user(), true);
// Update global directory in background
- $url = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
- if ($url && strlen(Config::get('system', 'directory'))) {
+ $url = DI::baseUrl()->get() . '/profile/' . $a->user['nickname'];
+ if ($url && strlen(DI::config()->get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, 'Directory', $url);
}
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
- info(L10n::t('Meow!'));
+ info(DI::l10n()->t('Meow!'));
return;
}
if (!empty($_POST['catavatar-morecat'])) {
- PConfig::set(local_user(), 'catavatar', 'seed', time());
+ DI::pConfig()->set(local_user(), 'catavatar', 'seed', time());
}
if (!empty($_POST['catavatar-emailcat'])) {
- PConfig::delete(local_user(), 'catavatar', 'seed');
+ DI::pConfig()->delete(local_user(), 'catavatar', 'seed');
}
}
function catavatar_lookup(App $a, &$b)
{
$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
- $url = $a->getBaseURL() . '/catavatar/' . $user['uid'];
+ if (DBA::isResult($user)) {
+ $url = DI::baseUrl()->get() . '/catavatar/' . $user['uid'];
+ } else {
+ $url = DI::baseUrl()->get() . '/catavatar/' . md5(trim(strtolower($b['email'])));
+ }
switch($b['size']) {
case 300: $url .= "/4"; break;
case 80: $url .= "/5"; break;
- case 47: $url .= "/6"; break;
+ case 48: $url .= "/6"; break;
}
$b['url'] = $url;
throw new NotFoundException(); // this should be catched on index and show default "not found" page.
}
- $uid = intval($a->argv[1]);
+ if (is_numeric($a->argv[1])) {
+ $uid = intval($a->argv[1]);
+ $condition = ['uid' => $uid,
+ 'account_expired' => false, 'account_removed' => false];
+ $user = DBA::selectFirst('user', ['email'], $condition);
- $size = 0;
- if ($a->argc == 3) {
- $size = intval($a->argv[2]);
- }
-
- $condition = ['uid' => $uid,
- 'account_expired' => false, 'account_removed' => false];
- $user = DBA::selectFirst('user', ['email'], $condition);
+ if ($user === false) {
+ throw new NotFoundException();
+ }
- if ($user === false) {
+ $seed = DI::pConfig()->get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
+ } elseif (!empty($a->argv[1])) {
+ $seed = $a->argv[1];
+ } else {
throw new NotFoundException();
}
- $seed = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
+ $size = 0;
+ if ($a->argc == 3) {
+ $size = intval($a->argv[2]);
+ }
// ...Or start generation
ob_start();
exit();
}
-
-
/**
* ====================
* CAT-AVATAR-GENERATOR
projects / friendica-addons.git / blobdiff