krynn addon DE translation updated

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

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index a644991e9aa98106fc5765c59fd4efbc1106d8ac..7c5b5595f52cde769cc313dc79290d1e2f5ef0e2 100644 (file)
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,7 +7,6 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
@@ -32,18 +31,6 @@ function catavatar_install()
        Logger::log('registered catavatar');
 }
 
-/**
- * Removes the addon hook
- */
-function catavatar_uninstall()
-{
-       Hook::unregister('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
-       Hook::unregister('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
-       Hook::unregister('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
-
-       Logger::log('unregistered catavatar');
-}
-
 /**
  * Cat avatar user settings page
  */
@@ -63,6 +50,7 @@ function catavatar_addon_settings(App $a, &$s)
                '$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.'),
        ]);
 }
 
@@ -111,7 +99,7 @@ function catavatar_addon_settings_post(App $a, &$s)
 
                // Update global directory in background
                $url = DI::baseUrl()->get() . '/profile/' . $a->user['nickname'];
-               if ($url && strlen(Config::get('system', 'directory'))) {
+               if ($url && strlen(DI::config()->get('system', 'directory'))) {
                        Worker::add(PRIORITY_LOW, 'Directory', $url);
                }
 
@@ -139,12 +127,16 @@ function catavatar_addon_settings_post(App $a, &$s)
 function catavatar_lookup(App $a, &$b)
 {
        $user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
-       $url = DI::baseUrl()->get() . '/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;
@@ -165,22 +157,27 @@ function catavatar_content(App $a)
                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 = DI::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();
@@ -193,8 +190,6 @@ function catavatar_content(App $a)
        exit();
 }
 
-
-
 /**
  * ====================
  * CAT-AVATAR-GENERATOR