X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=catavatar%2Fcatavatar.php;h=7a2bdc2eaf9623e5b15db868972f323a809dff45;hb=285079c12b9108572f1ea7978dc585f26d6b399d;hp=77dd1812a1089f69689425b6e9a0dabc25281f94;hpb=5535fa9fd2898571b702dc6c343de68d3d813f6c;p=friendica-addons.git

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 77dd1812..7a2bdc2e 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,16 +7,15 @@
  */
 
 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\Model\Profile;
 use Friendica\Network\HTTPException\NotFoundException;
 
 define("CATAVATAR_SIZE", 256);
@@ -26,45 +25,39 @@ 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', __FILE__, 'catavatar_lookup');
+	Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
+	Hook::register('addon_settings_post', __FILE__, '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');
+	Logger::notice('registered catavatar');
 }
 
 /**
  * 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' => 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'),
+	$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,
+		],
+	];
 }
 
 /**
@@ -76,19 +69,12 @@ function catavatar_addon_settings_post(App $a, &$s)
 		return;
 	}
 
-	// delete the current cached cat avatar
-	$condition = ['uid' => local_user(), 'blocked' => false,
-			'account_expired' => false, 'account_removed' => false];
-	$user = DBA::selectFirst('user', ['email'], $condition);
-
-	$seed = 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."));
+			DI::sysmsg()->addNotice(DI::l10n()->t("The cat hadn't found itself."));
 			return;
 		}
 
@@ -97,13 +83,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.'));
+			DI::sysmsg()->addNotice(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']);
@@ -111,23 +97,18 @@ function catavatar_addon_settings_post(App $a, &$s)
 		Contact::updateSelfFromUserID(local_user(), true);
 
 		// Update global directory in background
-		$url = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
-		if ($url && strlen(Config::get('system', 'directory'))) {
-			Worker::add(PRIORITY_LOW, 'Directory', $url);
-		}
-
-		Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
+		Profile::publishUpdate(local_user());
 
-		info(L10n::t('Meow!'));
+		DI::sysmsg()->addInfo(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');
 	}
 }
 
@@ -137,21 +118,30 @@ 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']]);
-	$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;
 	$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() {}
 
 /**
@@ -162,26 +152,31 @@ function catavatar_module() {}
  */
 function catavatar_content(App $a)
 {
-	if ($a->argc < 2 || $a->argc > 3) {
+	if (DI::args()->getArgc() < 2 || DI::args()->getArgc() > 3) {
 		throw new NotFoundException(); // this should be catched on index and show default "not found" page.
 	}
 
-	$uid = intval($a->argv[1]);
-
-	$size = 0;
-	if ($a->argc == 3) {
-		$size = intval($a->argv[2]);
-	}
+	if (is_numeric(DI::args()->getArgv()[1])) {
+		$uid = intval(DI::args()->getArgv()[1]);
+		$condition = ['uid' => $uid,
+				'account_expired' => false, 'account_removed' => false];
+		$user = DBA::selectFirst('user', ['email'], $condition);
 
-	$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(DI::args()->getArgv()[1])) {
+		$seed = DI::args()->getArgv()[1];
+	} else {
 		throw new NotFoundException();
 	}
 
-	$seed = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
+	$size = 0;
+	if (DI::args()->getArgc() == 3) {
+		$size = intval(DI::args()->getArgv()[2]);
+	}
 
 	// ...Or start generation
 	ob_start();
@@ -194,8 +189,6 @@ function catavatar_content(App $a)
 	exit();
 }
 
-
-
 /**
  * ====================
  * CAT-AVATAR-GENERATOR