*/
use Friendica\App;
-use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\Hook;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
use Friendica\Core\Worker;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Photo;
use Friendica\Network\HTTPException\NotFoundException;
*/
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');
}
/**
*/
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');
}
/**
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(),
// delete the current cached cat avatar
$condition = ['uid' => local_user(), 'blocked' => false,
'account_expired' => false, 'account_removed' => false];
- $user = dba::selectFirst('user', ['email'], $condition);
+ $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->get_baseurl() . '/catavatar/' . local_user() . '?ts=' . time();
+ $url = $a->getBaseURL() . '/catavatar/' . local_user() . '?ts=' . time();
- $self = dba::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
- if (!DBM::is_result($self)) {
+ $self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
+ if (!DBA::isResult($self)) {
notice(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)) {
+ $photo = DBA::selectFirst('photo', ['resource-id'], $condition);
+ if (!DBA::isResult($photo)) {
notice(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']]);
+ 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'];
+ $url = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
if ($url && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, 'Directory', $url);
}
*/
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']]);
+ $url = $a->getBaseURL() . '/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;
}
$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);
+ $user = DBA::selectFirst('user', ['email'], $condition);
if ($user === false) {
throw new NotFoundException();
if ($size > 3 && $size < 7) {
switch ($size) {
case 4:
- $size = 175;
+ $size = 300;
break;
case 5:
$size = 80;