X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=catavatar%2Fcatavatar.php;h=69f71ef60e012528da38ba621974ac265674ba1b;hb=39c654da00e63a58b6a930e7d0e555bfb248b44b;hp=7a2bdc2eaf9623e5b15db868972f323a809dff45;hpb=bca0943e191c3b262e892474b6f6281756afdb09;p=friendica-addons.git

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 7a2bdc2e..69f71ef6 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -35,16 +35,16 @@ function catavatar_install()
 /**
  * Cat avatar user settings page
  */
-function catavatar_addon_settings(App $a, array &$data)
+function catavatar_addon_settings(array &$data)
 {
-	if (!local_user()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
 	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
 	$html = Renderer::replaceMacros($t, [
 		'$uncache'      => time(),
-		'$uid'          => local_user(),
+		'$uid'          => DI::userSession()->getLocalUserId(),
 		'$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'),
 	]);
 
@@ -55,7 +55,7 @@ function catavatar_addon_settings(App $a, array &$data)
 		'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,
+			'catavatar-emailcat' => DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'catavatar', 'seed', false) ? DI::l10n()->t('Reset to email Cat') : null,
 		],
 	];
 }
@@ -63,62 +63,61 @@ function catavatar_addon_settings(App $a, array &$data)
 /**
  * Cat avatar user settings POST handle
  */
-function catavatar_addon_settings_post(App $a, &$s)
+function catavatar_addon_settings_post(&$s)
 {
-	if (!local_user()) {
+	if (!DI::userSession()->getLocalUserId()) {
 		return;
 	}
 
 	if (!empty($_POST['catavatar-usecat'])) {
-		$url = DI::baseUrl()->get() . '/catavatar/' . local_user() . '?ts=' . time();
+		$url = DI::baseUrl()->get() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
 
-		$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
 		if (!DBA::isResult($self)) {
 			DI::sysmsg()->addNotice(DI::l10n()->t("The cat hadn't found itself."));
 			return;
 		}
 
-		Photo::importProfilePhoto($url, local_user(), $self['id']);
+		Photo::importProfilePhoto($url, DI::userSession()->getLocalUserId(), $self['id']);
 
-		$condition = ['uid' => local_user(), 'contact-id' => $self['id']];
+		$condition = ['uid' => DI::userSession()->getLocalUserId(), 'contact-id' => $self['id']];
 		$photo = DBA::selectFirst('photo', ['resource-id'], $condition);
 		if (!DBA::isResult($photo)) {
 			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()]);
+		DBA::update('photo', ['profile' => false], ['profile' => true, 'uid' => DI::userSession()->getLocalUserId()]);
 
 		$fields = ['profile' => true, 'album' => DI::l10n()->t('Profile Photos'), 'contact-id' => 0];
-		DBA::update('photo', $fields, ['uid' => local_user(), 'resource-id' => $photo['resource-id']]);
+		DBA::update('photo', $fields, ['uid' => DI::userSession()->getLocalUserId(), 'resource-id' => $photo['resource-id']]);
 
-		Photo::importProfilePhoto($url, local_user(), $self['id']);
+		Photo::importProfilePhoto($url, DI::userSession()->getLocalUserId(), $self['id']);
 
-		Contact::updateSelfFromUserID(local_user(), true);
+		Contact::updateSelfFromUserID(DI::userSession()->getLocalUserId(), true);
 
 		// Update global directory in background
-		Profile::publishUpdate(local_user());
+		Profile::publishUpdate(DI::userSession()->getLocalUserId());
 
 		DI::sysmsg()->addInfo(DI::l10n()->t('Meow!'));
 		return;
 	}
 
 	if (!empty($_POST['catavatar-morecat'])) {
-		DI::pConfig()->set(local_user(), 'catavatar', 'seed', time());
+		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'catavatar', 'seed', time());
 	}
 
 	if (!empty($_POST['catavatar-emailcat'])) {
-		DI::pConfig()->delete(local_user(), 'catavatar', 'seed');
+		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'catavatar', 'seed');
 	}
 }
 
 /**
  * Returns the URL to the cat avatar
  *
- * @param $a array
  * @param &$b array
  */
-function catavatar_lookup(App $a, array &$b)
+function catavatar_lookup(array &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
 	if (DBA::isResult($user)) {
@@ -150,7 +149,7 @@ function catavatar_module() {}
  * @throws NotFoundException
  *
  */
-function catavatar_content(App $a)
+function catavatar_content()
 {
 	if (DI::args()->getArgc() < 2 || DI::args()->getArgc() > 3) {
 		throw new NotFoundException(); // this should be catched on index and show default "not found" page.