X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=a0faa40cf588134fdd8ba1db6e3e88bad1f05b66;hb=9c507e9577286c757df1946441f30e529082a3c8;hp=a1428adc878d60b862962e2c6ec94472e5c7cfd3;hpb=2fa6cc000013089d59d9cc221b544ed1a7a4cd37;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index a1428adc87..a0faa40cf5 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -4,15 +4,18 @@
*/
use Friendica\App;
+use Friendica\BaseModule;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
use Friendica\Core\System;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
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)
{
@@ -25,15 +28,14 @@ function profile_photo_init(App $a)
function profile_photo_post(App $a)
{
-
if (!local_user()) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
- check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+ BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
- if ((x($_POST, 'cropfinal')) && ($_POST['cropfinal'] == 1)) {
+ if (!empty($_POST['cropfinal']) && $_POST['cropfinal'] == 1) {
// unless proven otherwise
$is_default_profile = 1;
@@ -42,7 +44,10 @@ function profile_photo_post(App $a)
$r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1", intval($_REQUEST['profile']),
intval(local_user())
);
- if (DBM::is_result($r) && (!intval($r[0]['is-default']))) $is_default_profile = 0;
+
+ if (DBA::isResult($r) && (!intval($r[0]['is-default']))) {
+ $is_default_profile = 0;
+ }
}
@@ -67,22 +72,20 @@ function profile_photo_post(App $a)
$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));
-
- if (DBM::is_result($r)) {
+ $base_image = Photo::selectFirst([], ['resource-id' => $image_id, 'uid' => local_user(), 'scale' => $scale]);
- $base_image = $r[0];
+ $path = 'profile/' . $a->user['nickname'];
+ if (DBA::isResult($base_image)) {
- $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);
if ($r === false) {
- notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
+ notice(L10n::t('Image size reduction [%s] failed.', "300") . EOL);
}
$Image->scaleDown(80);
@@ -106,13 +109,13 @@ function profile_photo_post(App $a)
// 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(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
+ DBA::escape(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
intval($_REQUEST['profile']), intval(local_user())
);
}
@@ -121,9 +124,8 @@ function profile_photo_post(App $a)
info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background
- $url = System::baseUrl() . '/profile/' . $a->user['nickname'];
- 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", $a->getBaseURL() . '/' . $path);
}
Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
@@ -132,7 +134,7 @@ function profile_photo_post(App $a)
}
}
- goaway(System::baseUrl() . '/profiles');
+ $a->internalRedirect($path);
return; // NOTREACHED
}
@@ -147,7 +149,7 @@ function profile_photo_post(App $a)
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
- notice(L10n::t('Image exceeds size limit of %s', formatBytes($maximagesize)) . EOL);
+ notice(L10n::t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize)) . EOL);
@unlink($src);
return;
}
@@ -163,7 +165,9 @@ function profile_photo_post(App $a)
$ph->orient($src);
@unlink($src);
- profile_photo_crop_ui_head($a, $ph);
+
+ $imagecrop = profile_photo_crop_ui_head($a, $ph);
+ $a->internalRedirect('profile_photo/use/' . $imagecrop['hash']);
}
function profile_photo_content(App $a)
@@ -182,35 +186,39 @@ function profile_photo_content(App $a)
$imagecrop = [];
- if ($a->argv[1] == 'use') {
- if ($a->argc < 3) {
- notice(L10n::t('Permission denied.') . EOL);
- return;
- };
-
-// check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+ if (isset($a->argv[1]) && $a->argv[1] == 'use' && $a->argc >= 3) {
+ // BaseModule::checkFormSecurityTokenRedirectOnError('/profile_photo', 'profile_photo');
$resource_id = $a->argv[2];
//die(":".local_user());
+
+ $r = Photo::select([], ["resource-id" => $resource_id, "uid" => local_user()], ["order" => ["scale"=>false]]);
+
+ /*
$r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()),
- dbesc($resource_id)
+ DBA::escape($resource_id)
);
- if (!DBM::is_result($r)) {
+ */
+
+ if (!DBA::isResult($r)) {
notice(L10n::t('Permission denied.') . EOL);
return;
}
+
$havescale = false;
foreach ($r as $rr) {
- if ($rr['scale'] == 5) $havescale = true;
+ if ($rr['scale'] == 5) {
+ $havescale = true;
+ }
}
// 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()));
+ 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);
@@ -221,10 +229,11 @@ function profile_photo_content(App $a)
Worker::add(PRIORITY_LOW, "Directory", $url);
}
- goaway(System::baseUrl() . '/profiles');
+ $a->internalRedirect('profile/' . $a->user['nickname']);
return; // NOTREACHED
}
- $ph = new Image($r[0]['data'], $r[0]['type']);
+ $ph = Photo::getImageForPhoto($r[0]);
+
$imagecrop = profile_photo_crop_ui_head($a, $ph);
// go ahead as we have jus uploaded a new photo to crop
}
@@ -233,11 +242,10 @@ function profile_photo_content(App $a)
intval(local_user())
);
+ if (empty($imagecrop)) {
+ $tpl = Renderer::getMarkupTemplate('profile_photo.tpl');
- if (!empty($imagecrop)) {
- $tpl = get_markup_template('profile_photo.tpl');
-
- $o = replace_macros($tpl,
+ $o = Renderer::replaceMacros($tpl,
[
'$user' => $a->user['nickname'],
'$lbl_upfile' => L10n::t('Upload File:'),
@@ -245,7 +253,7 @@ function profile_photo_content(App $a)
'$title' => L10n::t('Upload Profile Photo'),
'$submit' => L10n::t('Upload'),
'$profiles' => $profiles,
- '$form_security_token' => get_form_security_token("profile_photo"),
+ '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
'$select' => sprintf('%s %s', L10n::t('or'),
($newuser) ? '' . L10n::t('skip this step') . '' : '' . L10n::t('select a photo from your photo albums') . '')
]);
@@ -253,41 +261,39 @@ function profile_photo_content(App $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' => intval($_REQUEST['profile']),
+ '$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"),
+ '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
'$done' => L10n::t('Done Editing')
]);
return $o;
}
-
- return; // NOTREACHED
}
-function profile_photo_crop_ui_head(App $a, Image $Image)
+function profile_photo_crop_ui_head(App $a, Image $image)
{
$max_length = Config::get('system', 'max_image_length');
if (!$max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
if ($max_length > 0) {
- $Image->scaleDown($max_length);
+ $image->scaleDown($max_length);
}
- $width = $Image->getWidth();
- $height = $Image->getHeight();
+ $width = $image->getWidth();
+ $height = $image->getHeight();
if ($width < 175 || $height < 175) {
- $Image->scaleUp(200);
- $width = $Image->getWidth();
- $height = $Image->getHeight();
+ $image->scaleUp(300);
+ $width = $image->getWidth();
+ $height = $image->getHeight();
}
$hash = Photo::newResource();
@@ -296,7 +302,7 @@ function profile_photo_crop_ui_head(App $a, Image $Image)
$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, L10n::t('Profile Photos'), 0);
if ($r) {
info(L10n::t('Image uploaded successfully.') . EOL);
@@ -305,8 +311,8 @@ function profile_photo_crop_ui_head(App $a, Image $Image)
}
if ($width > 640 || $height > 640) {
- $Image->scaleDown(640);
- $r = Photo::store($Image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
+ $image->scaleDown(640);
+ $r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 1);
if ($r === false) {
notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL);
@@ -315,13 +321,12 @@ function profile_photo_crop_ui_head(App $a, Image $Image)
}
}
- $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
- $a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
+ $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
$imagecrop = [
'hash' => $hash,
'resolution' => $smallest,
- 'ext' => $Image->getExt(),
+ 'ext' => $image->getExt(),
];
return $imagecrop;