X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=a0faa40cf588134fdd8ba1db6e3e88bad1f05b66;hb=9c507e9577286c757df1946441f30e529082a3c8;hp=19188ba23e884886b5b10ff6a9e6665fc6732ac9;hpb=ff203c277dfd8619ccfb63edebaf54274e27bf2d;p=friendica.git diff --git a/mod/profile_photo.php b/mod/profile_photo.php index 19188ba23e..a0faa40cf5 100644 --- a/mod/profile_photo.php +++ b/mod/profile_photo.php @@ -7,6 +7,7 @@ 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\DBA; @@ -14,7 +15,7 @@ use Friendica\Model\Contact; use Friendica\Model\Photo; use Friendica\Model\Profile; use Friendica\Object\Image; -use Friendica\Util\Security; +use Friendica\Util\Strings; function profile_photo_init(App $a) { @@ -71,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", DBA::escape($image_id), - DBA::escape(local_user()), intval($scale)); + $base_image = Photo::selectFirst([], ['resource-id' => $image_id, 'uid' => local_user(), 'scale' => $scale]); $path = 'profile/' . $a->user['nickname']; - if (DBA::isResult($r)) { - $base_image = $r[0]; + 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); @@ -110,11 +109,11 @@ 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", + 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", + 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()) @@ -150,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; } @@ -192,9 +191,14 @@ function profile_photo_content(App $a) $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()), DBA::escape($resource_id) ); + */ if (!DBA::isResult($r)) { notice(L10n::t('Permission denied.') . EOL); @@ -211,9 +215,9 @@ function profile_photo_content(App $a) // 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()), + q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()), DBA::escape($resource_id) ); @@ -228,7 +232,8 @@ function profile_photo_content(App $a) $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 } @@ -238,9 +243,9 @@ function profile_photo_content(App $a) ); 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:'), @@ -256,8 +261,8 @@ 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' => (isset($_REQUEST['profile']) ? intval($_REQUEST['profile']) : 0), @@ -270,8 +275,6 @@ function profile_photo_content(App $a) ]); return $o; } - - return; // NOTREACHED } function profile_photo_crop_ui_head(App $a, Image $image) @@ -288,7 +291,7 @@ function profile_photo_crop_ui_head(App $a, Image $image) $height = $image->getHeight(); if ($width < 175 || $height < 175) { - $image->scaleUp(200); + $image->scaleUp(300); $width = $image->getWidth(); $height = $image->getHeight(); } @@ -318,7 +321,7 @@ function profile_photo_crop_ui_head(App $a, Image $image) } } - $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []); + $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []); $imagecrop = [ 'hash' => $hash,