X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=catavatar%2Fcatavatar.php;h=7c5b5595f52cde769cc313dc79290d1e2f5ef0e2;hb=28623e80b3b1193d47c6a5dac05519c75b9af29e;hp=10f0093c62d8607aa3674cc2c7261fd392bcebe3;hpb=ac5db74a8b2379c6156d0227e18556ddea3daa24;p=friendica-addons.git

diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 10f0093c..7c5b5595 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -5,17 +5,17 @@
  * Version: 1.1
  * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
  */
+
 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\Renderer;
 use Friendica\Core\Worker;
-use Friendica\Core\PConfig;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Network\HTTPException\NotFoundException;
+use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo;
-use Friendica\Database\DBM;
+use Friendica\Network\HTTPException\NotFoundException;
 
 define("CATAVATAR_SIZE", 256);
 
@@ -24,23 +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');
-
-	logger('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');
+	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('unregistered catavatar');
+	Logger::log('registered catavatar');
 }
 
 /**
@@ -52,16 +40,17 @@ 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'),
+		'$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'),
 	]);
 }
 
@@ -75,74 +64,60 @@ function catavatar_addon_settings_post(App $a, &$s)
 	}
 
 	// delete the current cached cat avatar
-	$user = dba::selectFirst('user', ['email'],
-		[
-			'uid' => $uid,
-			'blocked' => 0,
-			'account_expired' => 0,
-			'account_removed' => 0,
-		]
-	);
-	$seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
-	$imageurl = preg_replace('/[^A-Za-z0-9\._-]/', '', $seed);
-	$imageurl = substr($imageurl,0,35).'';
-	$cachefile = get_cachefile($imageurl);
-	if ($cachefile != "" && file_exists($cachefile)) {
-		unlink($cachefile);
-	}
+	$condition = ['uid' => local_user(), 'blocked' => false,
+			'account_expired' => false, 'account_removed' => false];
+	$user = DBA::selectFirst('user', ['email'], $condition);
 
+	$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 (!DBM::is_result($self)) {
-			notice(L10n::t("The cat hadn't found itself."));
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
+		if (!DBA::isResult($self)) {
+			notice(DI::l10n()->t("The cat hadn't found itself."));
 			return;
 		}
 
 		Photo::importProfilePhoto($url, local_user(), $self['id']);
 
 		$condition = ['uid' => local_user(), 'contact-id' => $self['id']];
-		$photo = dba::selectFirst('photo', ['resource-id'], $condition);
-		if (!DBM::is_result($photo)) {
-			notice(L10n::t('There was an error, the cat ran away.'));
+		$photo = DBA::selectFirst('photo', ['resource-id'], $condition);
+		if (!DBA::isResult($photo)) {
+			notice(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' => local_user()]);
 
-		$fields = ['profile' => true, 'album' => L10n::t('Profile Photos'), 'contact-id' => 0];
-		dba::update('photo', $fields, ['uid' => local_user(), 'resource-id' => $photo['resource-id']]);
+		$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']);
 
 		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');
 	}
 }
 
-
 /**
  * Returns the URL to the cat avatar
  *
@@ -151,22 +126,24 @@ 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'];
+	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
+	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 175: $url .= "/4"; break;
+		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;
 }
 
-
-function catavatar_module(){}
-
+function catavatar_module() {}
 
 /**
  * Returns image for user id
@@ -180,43 +157,26 @@ 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]);
-
-	$size = 0;
-	if ($a->argc == 3) {
-		$size = intval($a->argv[2]);
-	}
+	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);
 
-	$user = dba::selectFirst('user', ['email'],
-		[
-			'uid' => $uid,
-			'blocked' => 0,
-			'account_expired' => 0,
-			'account_removed' => 0,
-		]
-	);
+		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 = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
-
-	// from cat-avatar-generator.php
-	$imageurl = $seed . "-" . $size;
-	$imageurl = preg_replace('/[^A-Za-z0-9\._-]/', '', $imageurl);
-	$imageurl = substr($imageurl,0,35) . '';
-	$cachefile = get_cachefile($imageurl);
-	$cachetime = 604800; # 1 week (1 day = 86400)
-
-	// Serve from the cache if it is younger than $cachetime
-	if ($cachefile != "" && file_exists($cachefile) && (time() - $cachetime) < filemtime($cachefile)) {
-		header('Pragma: public');
-		header('Cache-Control: max-age=86400');
-		header('Expires: '. gmdate('D, d M Y H:i:s \G\M\T', time() + 86400));
-		header('Content-Type: image/jpg');
-		readfile($cachefile);
-		exit();
+	$size = 0;
+	if ($a->argc == 3) {
+		$size = intval($a->argv[2]);
 	}
 
 	// ...Or start generation
@@ -225,21 +185,11 @@ function catavatar_content(App $a)
 	// render the picture:
 	build_cat($seed, $size);
 
-	// Save/cache the output to a file
-	if ($cachefile != "") {
-		$savedfile = fopen($cachefile, 'w+'); # w+ to be at start of the file, write mode, and attempt to create if not existing.
-		fwrite($savedfile, ob_get_contents());
-		fclose($savedfile);
-		chmod($cachefile, 0755);
-	}
-
 	ob_end_flush();
 
 	exit();
 }
 
-
-
 /**
  * ====================
  * CAT-AVATAR-GENERATOR
@@ -256,34 +206,34 @@ function build_cat($seed = '', $size = 0)
 {
 	// init random seed
 	if ($seed) {
-		srand(hexdec(substr(md5($seed),0,6)));
+		srand(hexdec(substr(md5($seed), 0, 6)));
 	}
 
 	// throw the dice for body parts
 	$parts = array(
-		'body' => rand(1,15),
-		'fur' => rand(1,10),
-		'eyes' => rand(1,15),
-		'mouth' => rand(1,10),
-		'accessorie' => rand(1,20)
+		'body' => rand(1, 15),
+		'fur' => rand(1, 10),
+		'eyes' => rand(1, 15),
+		'mouth' => rand(1, 10),
+		'accessorie' => rand(1, 20)
 	);
 
 	// create backgound
 	$cat = @imagecreatetruecolor(CATAVATAR_SIZE, CATAVATAR_SIZE)
 		or die("GD image create failed");
 	$white = imagecolorallocate($cat, 255, 255, 255);
-	imagefill($cat,0,0,$white);
+	imagefill($cat, 0, 0, $white);
 
 	// add parts
-	foreach ($parts as $part => $num){
-		$file = dirname(__FILE__).'/avatars/'.$part.'_'.$num.'.png';
+	foreach ($parts as $part => $num) {
+		$file = dirname(__FILE__) . '/avatars/' . $part . '_' . $num . '.png';
 
 		$im = @imagecreatefrompng($file);
 		if (!$im) {
-			die('Failed to load '.$file);
+			die('Failed to load ' . $file);
 		}
 		imageSaveAlpha($im, true);
-		imagecopy($cat,$im,0,0,0,0,CATAVATAR_SIZE,CATAVATAR_SIZE);
+		imagecopy($cat, $im, 0, 0, 0, 0, CATAVATAR_SIZE, CATAVATAR_SIZE);
 		imagedestroy($im);
 	}
 
@@ -291,7 +241,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;
@@ -316,7 +266,7 @@ function build_cat($seed = '', $size = 0)
 
 	header('Pragma: public');
 	header('Cache-Control: max-age=86400');
-	header('Expires: '. gmdate('D, d M Y H:i:s \G\M\T', time() + 86400));
+	header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 86400));
 	header('Content-Type: image/jpg');
 	imagejpeg($cat, NULL, 90);
 	imagedestroy($cat);