X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=catavatar%2Fcatavatar.php;h=db67a355463493430ee96fd99d5884838579ae80;hb=4e9838f5717f789c650a1109574189e23fdf88da;hp=f84ae117dfdfc17550e0e1b9efc928a5f3e1a35e;hpb=f4ad0d372125f51a11a27ee036217d93a48deafb;p=friendica-addons.git

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index f84ae117..db67a355 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,12 +7,12 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
-use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+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;
 use Friendica\Model\Photo;
 use Friendica\Network\HTTPException\NotFoundException;
@@ -24,11 +24,11 @@ define("CATAVATAR_SIZE", 256);
  */
 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('registered catavatar');
+	Logger::log('registered catavatar');
 }
 
 /**
@@ -36,11 +36,11 @@ function catavatar_install()
  */
 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');
+	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('unregistered catavatar');
+	Logger::log('unregistered catavatar');
 }
 
 /**
@@ -52,16 +52,16 @@ function catavatar_addon_settings(App $a, &$s)
 		return;
 	}
 
-	$t = get_markup_template('settings.tpl', 'addon/catavatar/');
-	$s .= replace_macros ($t, [
+	$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' => 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'),
 	]);
 }
 
@@ -79,14 +79,14 @@ function catavatar_addon_settings_post(App $a, &$s)
 			'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->get_baseurl() . '/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;
 		}
 
@@ -95,13 +95,13 @@ 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(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']);
@@ -109,23 +109,23 @@ function catavatar_addon_settings_post(App $a, &$s)
 		Contact::updateSelfFromUserID(local_user(), true);
 
 		// Update global directory in background
-		$url = $a->get_baseurl() . '/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');
 	}
 }
 
@@ -138,10 +138,10 @@ function catavatar_addon_settings_post(App $a, &$s)
 function catavatar_lookup(App $a, &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
-	$url = $a->get_baseurl() . '/catavatar/' . $user['uid'];
+	$url = DI::baseUrl()->get() . '/catavatar/' . $user['uid'];
 
 	switch($b['size']) {
-		case 175: $url .= "/4"; break;
+		case 300: $url .= "/4"; break;
 		case 80: $url .= "/5"; break;
 		case 47: $url .= "/6"; break;
 	}
@@ -171,7 +171,7 @@ function catavatar_content(App $a)
 		$size = intval($a->argv[2]);
 	}
 
-	$condition = ['uid' => $uid, 'blocked' => false,
+	$condition = ['uid' => $uid,
 			'account_expired' => false, 'account_removed' => false];
 	$user = DBA::selectFirst('user', ['email'], $condition);
 
@@ -179,7 +179,7 @@ function catavatar_content(App $a)
 		throw new NotFoundException();
 	}
 
-	$seed = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
+	$seed = DI::pConfig()->get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
 
 	// ...Or start generation
 	ob_start();
@@ -245,7 +245,7 @@ function build_cat($seed = '', $size = 0)
 	if ($size > 3 && $size < 7) {
 		switch ($size) {
 			case 4:
-				$size = 175;
+				$size = 300;
 				break;
 			case 5:
 				$size = 80;