friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #585 from annando/nicer-cat 

Catavatar: Code/functionality cleanup
pull/587/head
Tobias Diekershoff 2018-04-16 09:34:35 +02:00 committed by GitHub
parent 7d156d39ec 5acf35ffa5
commit cf5ec0df96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
catavatar/catavatar.php
View File

@ -75,22 +75,11 @@ function catavatar_addon_settings_post(App $a, &$s)
} }
// delete the current cached cat avatar // delete the current cached cat avatar
$user = dba::selectFirst('user', ['email'], $condition = ['uid' => local_user(), 'blocked' => false,
[ 'account_expired' => false, 'account_removed' => false];
'uid' => $uid, $user = dba::selectFirst('user', ['email'], $condition);
'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);
}
$seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
if (!empty($_POST['catavatar-usecat'])) { if (!empty($_POST['catavatar-usecat'])) {
$url = $a->get_baseurl() . '/catavatar/' . local_user() . '?ts=' . time(); $url = $a->get_baseurl() . '/catavatar/' . local_user() . '?ts=' . time();
@ -131,8 +120,6 @@ function catavatar_addon_settings_post(App $a, &$s)
return; return;
} }
if (!empty($_POST['catavatar-morecat'])) { if (!empty($_POST['catavatar-morecat'])) {
PConfig::set(local_user(), 'catavatar', 'seed', time()); PConfig::set(local_user(), 'catavatar', 'seed', time());
} }
@ -142,7 +129,6 @@ function catavatar_addon_settings_post(App $a, &$s)
} }
} }
/** /**
* Returns the URL to the cat avatar * Returns the URL to the cat avatar
* *
@ -164,10 +150,8 @@ function catavatar_lookup(App $a, &$b)
$b['success'] = true; $b['success'] = true;
} }
function catavatar_module() {} function catavatar_module() {}
/** /**
* Returns image for user id * Returns image for user id
* *
@ -187,14 +171,9 @@ function catavatar_content(App $a)
$size = intval($a->argv[2]); $size = intval($a->argv[2]);
} }
$user = dba::selectFirst('user', ['email'], $condition = ['uid' => $uid, 'blocked' => false,
[ 'account_expired' => false, 'account_removed' => false];
'uid' => $uid, $user = dba::selectFirst('user', ['email'], $condition);
'blocked' => 0,
'account_expired' => 0,
'account_removed' => 0,
]
);
if ($user === false) { if ($user === false) {
throw new NotFoundException(); throw new NotFoundException();
@ -202,37 +181,12 @@ function catavatar_content(App $a)
$seed = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email'])))); $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();
}
// ...Or start generation // ...Or start generation
ob_start(); ob_start();
// render the picture: // render the picture:
build_cat($seed, $size); 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(); ob_end_flush();
exit(); exit();