*/
use Friendica\App;
+use Friendica\BaseModule;
use Friendica\Core\Config;
-use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Photo;
use Friendica\Model\Profile;
use Friendica\Object\Image;
+use Friendica\Util\Strings;
function profile_photo_init(App $a)
{
function profile_photo_post(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
- check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
if (!empty($_POST['cropfinal']) && $_POST['cropfinal'] == 1) {
intval(local_user())
);
- if (DBM::is_result($r) && (!intval($r[0]['is-default']))) {
+ if (DBA::isResult($r) && (!intval($r[0]['is-default']))) {
$is_default_profile = 0;
}
}
// phase 2 - we have finished cropping
if ($a->argc != 2) {
- notice(L10n::t('Image uploaded but image cropping failed.') . EOL);
+ notice(DI::l10n()->t('Image uploaded but image cropping failed.') . EOL);
return;
}
$srcW = $_POST['xfinal'] - $srcX;
$srcH = $_POST['yfinal'] - $srcY;
- $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", dbesc($image_id),
- dbesc(local_user()), intval($scale));
+ $base_image = Photo::selectFirst([], ['resource-id' => $image_id, 'uid' => local_user(), 'scale' => $scale]);
- $url = System::baseUrl() . '/profile/' . $a->user['nickname'];
- if (DBM::is_result($r)) {
+ $path = 'profile/' . $a->user['nickname'];
+ if (DBA::isResult($base_image)) {
- $base_image = $r[0];
-
- $Image = new Image($base_image['data'], $base_image['type']);
+ $Image = Photo::getImageForPhoto($base_image);
if ($Image->isValid()) {
- $Image->crop(175, $srcX, $srcY, $srcW, $srcH);
+ $Image->crop(300, $srcX, $srcY, $srcW, $srcH);
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
- L10n::t('Profile Photos'), 4, $is_default_profile);
+ DI::l10n()->t('Profile Photos'), 4, $is_default_profile);
if ($r === false) {
- notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
+ notice(DI::l10n()->t('Image size reduction [%s] failed.', "300") . EOL);
}
$Image->scaleDown(80);
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
- L10n::t('Profile Photos'), 5, $is_default_profile);
+ DI::l10n()->t('Profile Photos'), 5, $is_default_profile);
if ($r === false) {
- notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL);
+ notice(DI::l10n()->t('Image size reduction [%s] failed.', "80") . EOL);
}
$Image->scaleDown(48);
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
- L10n::t('Profile Photos'), 6, $is_default_profile);
+ DI::l10n()->t('Profile Photos'), 6, $is_default_profile);
if ($r === false) {
- notice(L10n::t('Image size reduction [%s] failed.', "48") . EOL);
+ notice(DI::l10n()->t('Image size reduction [%s] failed.', "48") . EOL);
}
// If setting for the default profile, unset the profile photo flag from any other photos I own
if ($is_default_profile) {
- $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
- dbesc($base_image['resource-id']), intval(local_user())
+ q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
+ DBA::escape($base_image['resource-id']), intval(local_user())
);
} else {
- $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
+ q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
+ DBA::escape(DI::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
+ DBA::escape(DI::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
intval($_REQUEST['profile']), intval(local_user())
);
}
Contact::updateSelfFromUserID(local_user(), true);
- info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
+ info(DI::l10n()->t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background
- if ($url && strlen(Config::get('system', 'directory'))) {
- Worker::add(PRIORITY_LOW, "Directory", $url);
+ if ($path && strlen(Config::get('system', 'directory'))) {
+ Worker::add(PRIORITY_LOW, "Directory", DI::baseUrl()->get() . '/' . $path);
}
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
} else {
- notice(L10n::t('Unable to process image') . EOL);
+ notice(DI::l10n()->t('Unable to process image') . EOL);
}
}
- goaway($url);
+ DI::baseUrl()->redirect($path);
return; // NOTREACHED
}
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
- notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
+ notice(DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
@unlink($src);
return;
}
$ph = new Image($imagedata, $filetype);
if (!$ph->isValid()) {
- notice(L10n::t('Unable to process image.') . EOL);
+ notice(DI::l10n()->t('Unable to process image.') . EOL);
@unlink($src);
return;
}
$ph->orient($src);
@unlink($src);
- $imagecrop = profile_photo_crop_ui_head($a, $ph);
- goaway(System::baseUrl() . '/profile_photo/use/' . $imagecrop['hash']);
+ $imagecrop = profile_photo_crop_ui_head($ph);
+ DI::baseUrl()->redirect('profile_photo/use/' . $imagecrop['hash']);
}
function profile_photo_content(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
$imagecrop = [];
if (isset($a->argv[1]) && $a->argv[1] == 'use' && $a->argc >= 3) {
- // check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+ // BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
$resource_id = $a->argv[2];
//die(":".local_user());
- $r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()),
- dbesc($resource_id)
- );
- if (!DBM::is_result($r)) {
- notice(L10n::t('Permission denied.') . EOL);
+ $r = Photo::selectToArray([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale" => false]]);
+ if (!DBA::isResult($r)) {
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return;
}
// set an already uloaded photo as profile photo
// if photo is in 'Profile Photos', change it in db
- if (($r[0]['album'] == L10n::t('Profile Photos')) && ($havescale)) {
- $r = q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user()));
+ if (($r[0]['album'] == DI::l10n()->t('Profile Photos')) && ($havescale)) {
+ q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user()));
- $r = q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()),
- dbesc($resource_id)
+ q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()),
+ DBA::escape($resource_id)
);
Contact::updateSelfFromUserID(local_user(), true);
Worker::add(PRIORITY_LOW, "Directory", $url);
}
- goaway(System::baseUrl() . '/profile/' . $a->user['nickname']);
+ DI::baseUrl()->redirect('profile/' . $a->user['nickname']);
return; // NOTREACHED
}
- $ph = new Image($r[0]['data'], $r[0]['type']);
- $imagecrop = profile_photo_crop_ui_head($a, $ph);
+ $ph = Photo::getImageForPhoto($r[0]);
+
+ $imagecrop = profile_photo_crop_ui_head($ph);
// go ahead as we have jus uploaded a new photo to crop
}
);
if (empty($imagecrop)) {
- $tpl = get_markup_template('profile_photo.tpl');
+ $tpl = Renderer::getMarkupTemplate('profile_photo.tpl');
- $o = replace_macros($tpl,
+ $o = Renderer::replaceMacros($tpl,
[
'$user' => $a->user['nickname'],
- '$lbl_upfile' => L10n::t('Upload File:'),
- '$lbl_profiles' => L10n::t('Select a profile:'),
- '$title' => L10n::t('Upload Profile Photo'),
- '$submit' => L10n::t('Upload'),
+ '$lbl_upfile' => DI::l10n()->t('Upload File:'),
+ '$lbl_profiles' => DI::l10n()->t('Select a profile:'),
+ '$title' => DI::l10n()->t('Upload Profile Photo'),
+ '$submit' => DI::l10n()->t('Upload'),
'$profiles' => $profiles,
- '$form_security_token' => get_form_security_token("profile_photo"),
- '$select' => sprintf('%s %s', L10n::t('or'),
- ($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="' . System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
+ '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
+ '$select' => sprintf('%s %s', DI::l10n()->t('or'),
+ ($newuser) ? '<a href="' . DI::baseUrl() . '">' . DI::l10n()->t('skip this step') . '</a>' : '<a href="' . DI::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . DI::l10n()->t('select a photo from your photo albums') . '</a>')
]);
return $o;
} else {
$filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext'];
- $tpl = get_markup_template("cropbody.tpl");
- $o = replace_macros($tpl,
+ $tpl = Renderer::getMarkupTemplate("cropbody.tpl");
+ $o = Renderer::replaceMacros($tpl,
[
'$filename' => $filename,
'$profile' => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0),
'$resource' => $imagecrop['hash'] . '-' . $imagecrop['resolution'],
- '$image_url' => System::baseUrl() . '/photo/' . $filename,
- '$title' => L10n::t('Crop Image'),
- '$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'),
- '$form_security_token' => get_form_security_token("profile_photo"),
- '$done' => L10n::t('Done Editing')
+ '$image_url' => DI::baseUrl() . '/photo/' . $filename,
+ '$title' => DI::l10n()->t('Crop Image'),
+ '$desc' => DI::l10n()->t('Please adjust the image cropping for optimum viewing.'),
+ '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
+ '$done' => DI::l10n()->t('Done Editing')
]);
return $o;
}
-
- return; // NOTREACHED
}
-function profile_photo_crop_ui_head(App $a, Image $image)
+function profile_photo_crop_ui_head(Image $image)
{
$max_length = Config::get('system', 'max_image_length');
if (!$max_length) {
$height = $image->getHeight();
if ($width < 175 || $height < 175) {
- $image->scaleUp(200);
+ $image->scaleUp(300);
$width = $image->getWidth();
$height = $image->getHeight();
}
$smallest = 0;
$filename = '';
- $r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0);
+ $r = Photo::store($image, local_user(), 0, $hash, $filename, DI::l10n()->t('Profile Photos'), 0);
if ($r) {
- info(L10n::t('Image uploaded successfully.') . EOL);
+ info(DI::l10n()->t('Image uploaded successfully.') . EOL);
} else {
- notice(L10n::t('Image upload failed.') . EOL);
+ notice(DI::l10n()->t('Image upload failed.') . EOL);
}
if ($width > 640 || $height > 640) {
$image->scaleDown(640);
- $r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
+ $r = Photo::store($image, local_user(), 0, $hash, $filename, DI::l10n()->t('Profile Photos'), 1);
if ($r === false) {
- notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL);
+ notice(DI::l10n()->t('Image size reduction [%s] failed.', "640") . EOL);
} else {
$smallest = 1;
}
}
- $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
- $a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
+ DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
$imagecrop = [
'hash' => $hash,
projects / friendica.git / blobdiff