Changes:

[friendica-addons.git] / birdavatar / birdavatar.php

diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
index 72f4728b44e4afb8d254e4a2ddd9d4459d06d68f..d17a455c3d4d02c9374bdb1d270c764bbcbcf23b 100644 (file)
--- a/birdavatar/birdavatar.php
+++ b/birdavatar/birdavatar.php
@@ -10,7 +10,6 @@ use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -25,34 +24,39 @@ define("BIRDAVATAR_SIZE", 256);
  */
 function birdavatar_install()
 {
-       Hook::register('avatar_lookup', 'addon/birdavatar/birdavatar.php', 'birdavatar_lookup');
-       Hook::register('addon_settings', 'addon/birdavatar/birdavatar.php', 'birdavatar_addon_settings');
-       Hook::register('addon_settings_post', 'addon/birdavatar/birdavatar.php', 'birdavatar_addon_settings_post');
+       Hook::register('avatar_lookup', __FILE__, 'birdavatar_lookup');
+       Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
+       Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
 
-       Logger::log('registered birdavatar');
+       Logger::info('registered birdavatar');
 }
 
 /**
  * Bird avatar user settings page
  */
-function birdavatar_addon_settings(App $a, &$s)
+function birdavatar_addon_settings(App $a, array &$data)
 {
        if (!local_user()) {
                return;
        }
 
-       $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/birdavatar/');
-       $s .= Renderer::replaceMacros($t, [
-               '$postpost'     => !empty($_POST['birdavatar-morebird']) || !empty($_POST['birdavatar-emailbird']),
+       $t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/birdavatar/');
+       $html = Renderer::replaceMacros($t, [
                '$uncache'      => time(),
                '$uid'          => local_user(),
-               '$usebird'      => DI::l10n()->t('Use Bird as Avatar'),
-               '$morebird'     => DI::l10n()->t('More Random Bird!'),
-               '$emailbird'    => DI::l10n()->t('Reset to email Bird'),
-               '$seed'         => DI::pConfig()->get(local_user(), 'birdavatar', 'seed', false),
-               '$header'       => DI::l10n()->t('Bird Avatar Settings'),
                '$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the bird.'),
        ]);
+
+       $data = [
+               'addon'  => 'birdavar',
+               'title'  => DI::l10n()->t('Bird Avatar Settings'),
+               'html'   => $html,
+               'submit' => [
+                       'birdavatar-usebird'   => DI::l10n()->t('Use Bird as Avatar'),
+                       'birdavatar-morebird'  => DI::l10n()->t('More Random Bird!'),
+                       'birdavatar-emailbird' => DI::pConfig()->get(local_user(), 'birdavatar', 'seed', false) ? DI::l10n()->t('Reset to email Bird') : null,
+               ],
+       ];
 }
 
 /**
@@ -113,7 +117,7 @@ function birdavatar_addon_settings_post(App $a, &$s)
  * @param $a array
  * @param &$b array
  */
-function birdavatar_lookup(App $a, &$b)
+function birdavatar_lookup(App $a, array &$b)
 {
        $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
        if (DBA::isResult($user)) {
@@ -149,9 +153,9 @@ function birdavatar_content(App $a)
        }
 
        if (is_numeric(DI::args()->getArgv()[1])) {
-               $uid = intval(DI::args()->getArgv()[1]);
+               $uid       = intval(DI::args()->getArgv()[1]);
                $condition = ['uid' => $uid,
-                               'account_expired' => false, 'account_removed' => false];
+                       'account_expired'  => false, 'account_removed' => false];
                $user = DBA::selectFirst('user', ['email'], $condition);
 
                if ($user === false) {