X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=d8e236a73787fc476df68fb993adeec1fa8cadfc;hb=aa4aaf1971c7aa83db529a83369b619123ae703c;hp=f52015155d689646a9acafcca66da18a93ac36f4;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index f52015155d..d8e236a737 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -2,61 +2,69 @@
/**
* @file mod/profile_photo.php
*/
+
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\Security;
+use Friendica\Util\Strings;
function profile_photo_init(App $a)
{
- if (! local_user()) {
+ if (!local_user()) {
return;
}
Profile::load($a, $a->user['nickname']);
}
-function profile_photo_post(App $a) {
-
- if (! local_user()) {
- notice ( t('Permission denied.') . EOL );
+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;
- if($_REQUEST['profile']) {
- $r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1",
- intval($_REQUEST['profile']),
+ if ($_REQUEST['profile']) {
+ $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'])))
+
+ if (DBA::isResult($r) && (!intval($r[0]['is-default']))) {
$is_default_profile = 0;
+ }
}
// phase 2 - we have finished cropping
- if($a->argc != 2) {
- notice( t('Image uploaded but image cropping failed.') . EOL );
+ if ($a->argc != 2) {
+ notice(L10n::t('Image uploaded but image cropping failed.') . EOL);
return;
}
$image_id = $a->argv[1];
- if(substr($image_id,-2,1) == '-') {
- $scale = substr($image_id,-1,1);
- $image_id = substr($image_id,0,-2);
+ if (substr($image_id, -2, 1) == '-') {
+ $scale = substr($image_id, -1, 1);
+ $image_id = substr($image_id, 0, -2);
}
@@ -65,90 +73,75 @@ 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)) {
+ $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));
+ $path = 'profile/' . $a->user['nickname'];
+ if (DBA::isResult($r)) {
$base_image = $r[0];
$Image = new Image($base_image['data'], $base_image['type']);
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'], t('Profile Photos'), 4, $is_default_profile);
+ $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 ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
+ notice(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'], t('Profile Photos'), 5, $is_default_profile);
+ $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
+ L10n::t('Profile Photos'), 5, $is_default_profile);
if ($r === false) {
- notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
+ notice(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'], t('Profile Photos'), 6, $is_default_profile);
+ $r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
+ L10n::t('Profile Photos'), 6, $is_default_profile);
if ($r === false) {
- notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
+ notice(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) {
+ 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())
- );
-
- $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` 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()),
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $Image->getExt()),
- intval(local_user())
+ 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()),
- intval($_REQUEST['profile']),
- intval(local_user())
+ 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())
);
}
- // we'll set the updated profile-photo timestamp even if it isn't the default profile,
- // so that browsers will do a cache update unconditionally
+ Contact::updateSelfFromUserID(local_user(), true);
- $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
- dbesc(datetime_convert()),
- intval(local_user())
- );
-
- info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
+ 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());
} else {
- notice( t('Unable to process image') . EOL);
+ notice(L10n::t('Unable to process image') . EOL);
}
}
- goaway(System::baseUrl() . '/profiles');
+ $a->internalRedirect($path);
return; // NOTREACHED
}
- $src = $_FILES['userfile']['tmp_name'];
+ $src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
$filetype = $_FILES['userfile']['type'];
@@ -159,7 +152,7 @@ function profile_photo_post(App $a) {
$maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
- notice(sprintf(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;
}
@@ -167,81 +160,78 @@ function profile_photo_post(App $a) {
$imagedata = @file_get_contents($src);
$ph = new Image($imagedata, $filetype);
- if (! $ph->isValid()) {
- notice(t('Unable to process image.') . EOL);
+ if (!$ph->isValid()) {
+ notice(L10n::t('Unable to process image.') . EOL);
@unlink($src);
return;
}
$ph->orient($src);
@unlink($src);
- return 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) {
+function profile_photo_content(App $a)
+{
- if (! local_user()) {
- notice( t('Permission denied.') . EOL );
+ if (!local_user()) {
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
$newuser = false;
- if($a->argc == 2 && $a->argv[1] === 'new')
+ if ($a->argc == 2 && $a->argv[1] === 'new') {
$newuser = true;
+ }
- if( $a->argv[1]=='use'){
- if ($a->argc<3){
- notice( t('Permission denied.') . EOL );
- return;
- };
+ $imagecrop = [];
-// 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=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( t('Permission denied.') . EOL );
+ $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);
return;
}
+
$havescale = false;
foreach ($r as $rr) {
- if($rr['scale'] == 5)
+ 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']== t('Profile Photos')) && ($havescale)){
- $r=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)
- );
+ 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()));
- $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
- dbesc(datetime_convert()),
- intval(local_user())
+ $r = 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);
+
// Update global directory in background
$url = $_SESSION['my_url'];
- if ($url && strlen(Config::get('system','directory'))) {
+ if ($url && strlen(Config::get('system', 'directory'))) {
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']);
- profile_photo_crop_ui_head($a, $ph);
+ $imagecrop = profile_photo_crop_ui_head($a, $ph);
// go ahead as we have jus uploaded a new photo to crop
}
@@ -249,37 +239,36 @@ function profile_photo_content(App $a) {
intval(local_user())
);
+ if (empty($imagecrop)) {
+ $tpl = Renderer::getMarkupTemplate('profile_photo.tpl');
- if(! x($a->config,'imagecrop')) {
-
- $tpl = get_markup_template('profile_photo.tpl');
-
- $o .= replace_macros($tpl,[
+ $o = Renderer::replaceMacros($tpl,
+ [
'$user' => $a->user['nickname'],
- '$lbl_upfile' => t('Upload File:'),
- '$lbl_profiles' => t('Select a profile:'),
- '$title' => t('Upload Profile Photo'),
- '$submit' => t('Upload'),
+ '$lbl_upfile' => L10n::t('Upload File:'),
+ '$lbl_profiles' => L10n::t('Select a profile:'),
+ '$title' => L10n::t('Upload Profile Photo'),
+ '$submit' => L10n::t('Upload'),
'$profiles' => $profiles,
- '$form_security_token' => get_form_security_token("profile_photo"),
- '$select' => sprintf('%s %s', t('or'), ($newuser) ? '' . t('skip this step') . '' : '' . t('select a photo from your photo albums') . '')
+ '$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') . '')
]);
return $o;
- }
- else {
- $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.'.$a->config['imagecrop_ext'];
- $resolution = $a->config['imagecrop_resolution'];
- $tpl = get_markup_template("cropbody.tpl");
- $o .= replace_macros($tpl,[
- '$filename' => $filename,
- '$profile' => intval($_REQUEST['profile']),
- '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
+ } else {
+ $filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext'];
+ $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' => t('Crop Image'),
- '$desc' => t('Please adjust the image cropping for optimum viewing.'),
- '$form_security_token' => get_form_security_token("profile_photo"),
- '$done' => t('Done Editing')
+ '$title' => L10n::t('Crop Image'),
+ '$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'),
+ '$form_security_token' => BaseModule::getFormSecurityToken("profile_photo"),
+ '$done' => L10n::t('Done Editing')
]);
return $o;
}
@@ -287,53 +276,57 @@ function profile_photo_content(App $a) {
return; // NOTREACHED
}
-
-function profile_photo_crop_ui_head(App $a, Image $Image) {
- $max_length = Config::get('system','max_image_length');
- if (! $max_length) {
+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_new_resource();
+ $hash = Photo::newResource();
$smallest = 0;
+ $filename = '';
- $r = Photo::store($Image, local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
+ $r = Photo::store($image, local_user(), 0, $hash, $filename, L10n::t('Profile Photos'), 0);
if ($r) {
- info( t('Image uploaded successfully.') . EOL );
+ info(L10n::t('Image uploaded successfully.') . EOL);
} else {
- notice( t('Image upload failed.') . EOL );
+ notice(L10n::t('Image upload failed.') . EOL);
}
if ($width > 640 || $height > 640) {
- $Image->scaleDown(640);
- $r = Photo::store($Image, local_user(), 0 , $hash, $filename, 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( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
+ notice(L10n::t('Image size reduction [%s] failed.', "640") . EOL);
} else {
$smallest = 1;
}
}
- $a->config['imagecrop'] = $hash;
- $a->config['imagecrop_resolution'] = $smallest;
- $a->config['imagecrop_ext'] = $Image->getExt();
- $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
- $a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
- return;
+ $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate("crophead.tpl"), []);
+
+ $imagecrop = [
+ 'hash' => $hash,
+ 'resolution' => $smallest,
+ 'ext' => $image->getExt(),
+ ];
+
+ return $imagecrop;
}