Merge pull request #1288 from nupplaphil/feat/move_monolog

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

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 181ac01636d009bdcc873e38cee22c5b5d3a2777..7a2bdc2eaf9623e5b15db868972f323a809dff45 100644 (file)
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -25,9 +25,9 @@ define("CATAVATAR_SIZE", 256);
  */
 function catavatar_install()
 {
-       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');
+       Hook::register('avatar_lookup', __FILE__, 'catavatar_lookup');
+       Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
+       Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
 
        Logger::notice('registered catavatar');
 }
@@ -35,24 +35,29 @@ function catavatar_install()
 /**
  * Cat avatar user settings page
  */
-function catavatar_addon_settings(App $a, &$s)
+function catavatar_addon_settings(App $a, array &$data)
 {
        if (!local_user()) {
                return;
        }
 
-       $t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
-       $s .= Renderer::replaceMacros($t, [
-               '$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
-               '$uncache' => time(),
-               '$uid' => local_user(),
-               '$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'),
+       $t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
+       $html = Renderer::replaceMacros($t, [
+               '$uncache'      => time(),
+               '$uid'          => local_user(),
                '$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'),
        ]);
+
+       $data = [
+               'addon'  => 'catavar',
+               'title'  => DI::l10n()->t('Cat Avatar Settings'),
+               'html'   => $html,
+               'submit' => [
+                       'catavatar-usecat'   => DI::l10n()->t('Use Cat as Avatar'),
+                       'catavatar-morecat'  => DI::l10n()->t('Another random Cat!'),
+                       'catavatar-emailcat' => DI::pConfig()->get(local_user(), 'catavatar', 'seed', false) ? DI::l10n()->t('Reset to email Cat') : null,
+               ],
+       ];
 }
 
 /**
@@ -69,7 +74,7 @@ function catavatar_addon_settings_post(App $a, &$s)
 
                $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
                if (!DBA::isResult($self)) {
-                       notice(DI::l10n()->t("The cat hadn't found itself."));
+                       DI::sysmsg()->addNotice(DI::l10n()->t("The cat hadn't found itself."));
                        return;
                }
 
@@ -78,7 +83,7 @@ function catavatar_addon_settings_post(App $a, &$s)
                $condition = ['uid' => local_user(), 'contact-id' => $self['id']];
                $photo = DBA::selectFirst('photo', ['resource-id'], $condition);
                if (!DBA::isResult($photo)) {
-                       notice(DI::l10n()->t('There was an error, the cat ran away.'));
+                       DI::sysmsg()->addNotice(DI::l10n()->t('There was an error, the cat ran away.'));
                        return;
                }
 
@@ -94,7 +99,7 @@ function catavatar_addon_settings_post(App $a, &$s)
                // Update global directory in background
                Profile::publishUpdate(local_user());
 
-               info(DI::l10n()->t('Meow!'));
+               DI::sysmsg()->addInfo(DI::l10n()->t('Meow!'));
                return;
        }
 
@@ -113,7 +118,7 @@ function catavatar_addon_settings_post(App $a, &$s)
  * @param $a array
  * @param &$b array
  */
-function catavatar_lookup(App $a, &$b)
+function catavatar_lookup(App $a, array &$b)
 {
        $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
        if (DBA::isResult($user)) {
@@ -132,6 +137,11 @@ function catavatar_lookup(App $a, &$b)
        $b['success'] = true;
 }
 
+/**
+ * This is a statement rather than an actual function definition. The simple
+ * existence of this method is checked to figure out if the addon offers a
+ * module.
+ */
 function catavatar_module() {}
 
 /**