X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=1a80b539db5a89b1057c2d44e7b812b2feb1f53b;hb=0e8fa341561c7fafb962564d4d46988298b84671;hp=b4723b215ff1e5bd8aeba1edfee74167c7b5c2a6;hpb=5adfeb0bd5fed2f793332056c03bb7c043d5fc69;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index b4723b215f..1a80b539db 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,23 +1,33 @@
user['nickname']);
+ Profile::load($a, $a->user['nickname']);
}
function profile_photo_post(App $a) {
if (! local_user()) {
- notice ( t('Permission denied.') . EOL );
+ notice(L10n::t('Permission denied.') . EOL );
return;
}
@@ -33,7 +43,7 @@ function profile_photo_post(App $a) {
intval($_REQUEST['profile']),
intval(local_user())
);
- if (dbm::is_result($r) && (! intval($r[0]['is-default'])))
+ if (DBM::is_result($r) && (! intval($r[0]['is-default'])))
$is_default_profile = 0;
}
@@ -42,7 +52,7 @@ function profile_photo_post(App $a) {
// phase 2 - we have finished cropping
if($a->argc != 2) {
- notice( t('Image uploaded but image cropping failed.') . EOL );
+ notice(L10n::t('Image uploaded but image cropping failed.') . EOL );
return;
}
@@ -64,77 +74,64 @@ function profile_photo_post(App $a) {
dbesc(local_user()),
intval($scale));
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$base_image = $r[0];
- $im = new Photo($base_image['data'], $base_image['type']);
- if($im->is_valid()) {
- $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
+ $Image = new Image($base_image['data'], $base_image['type']);
+ if ($Image->isValid()) {
+ $Image->crop(175,$srcX,$srcY,$srcW,$srcH);
- $r = $im->store(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.', "175") . EOL);
}
- $im->scaleImage(80);
+ $Image->scaleDown(80);
- $r = $im->store(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);
}
- $im->scaleImage(48);
+ $Image->scaleDown(48);
- $r = $im->store(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.' . $im->getExt()),
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
- 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.' . $im->getExt()),
- dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
+ 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())
);
}
- // 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(get_config('system','directory'))) {
- proc_run(PRIORITY_LOW, "include/directory.php", $url);
+ if ($url && strlen(Config::get('system','directory'))) {
+ Worker::add(PRIORITY_LOW, "Directory", $url);
}
- proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
+ Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
} else {
- notice( t('Unable to process image') . EOL);
+ notice(L10n::t('Unable to process image') . EOL);
}
}
@@ -147,22 +144,22 @@ function profile_photo_post(App $a) {
$filesize = intval($_FILES['userfile']['size']);
$filetype = $_FILES['userfile']['type'];
if ($filetype == "") {
- $filetype = guess_image_type($filename);
+ $filetype = Image::guessType($filename);
}
- $maximagesize = get_config('system','maximagesize');
+ $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', formatBytes($maximagesize)) . EOL);
@unlink($src);
return;
}
$imagedata = @file_get_contents($src);
- $ph = new Photo($imagedata, $filetype);
+ $ph = new Image($imagedata, $filetype);
- if (! $ph->is_valid()) {
- notice( t('Unable to process image.') . EOL );
+ if (! $ph->isValid()) {
+ notice(L10n::t('Unable to process image.') . EOL);
@unlink($src);
return;
}
@@ -173,11 +170,10 @@ function profile_photo_post(App $a) {
}
-if(! function_exists('profile_photo_content')) {
function profile_photo_content(App $a) {
if (! local_user()) {
- notice( t('Permission denied.') . EOL );
+ notice(L10n::t('Permission denied.') . EOL );
return;
}
@@ -188,7 +184,7 @@ function profile_photo_content(App $a) {
if( $a->argv[1]=='use'){
if ($a->argc<3){
- notice( t('Permission denied.') . EOL );
+ notice(L10n::t('Permission denied.') . EOL );
return;
};
@@ -200,8 +196,8 @@ function profile_photo_content(App $a) {
intval(local_user()),
dbesc($resource_id)
);
- if (!dbm::is_result($r)){
- notice( t('Permission denied.') . EOL );
+ if (!DBM::is_result($r)){
+ notice(L10n::t('Permission denied.') . EOL );
return;
}
$havescale = false;
@@ -212,7 +208,7 @@ 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']== t('Profile Photos')) && ($havescale)){
+ 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()));
@@ -221,21 +217,18 @@ function profile_photo_content(App $a) {
dbesc($resource_id)
);
- $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d",
- dbesc(datetime_convert()),
- intval(local_user())
- );
+ Contact::updateSelfFromUserID(local_user(), true);
// Update global directory in background
$url = $_SESSION['my_url'];
- if ($url && strlen(get_config('system','directory'))) {
- proc_run(PRIORITY_LOW, "include/directory.php", $url);
+ if ($url && strlen(Config::get('system','directory'))) {
+ Worker::add(PRIORITY_LOW, "Directory", $url);
}
goaway(System::baseUrl() . '/profiles');
return; // NOTREACHED
}
- $ph = new Photo($r[0]['data'], $r[0]['type']);
+ $ph = new Image($r[0]['data'], $r[0]['type']);
profile_photo_crop_ui_head($a, $ph);
// go ahead as we have jus uploaded a new photo to crop
}
@@ -249,78 +242,77 @@ function profile_photo_content(App $a) {
$tpl = get_markup_template('profile_photo.tpl');
- $o .= replace_macros($tpl,array(
+ $o = replace_macros($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') . '')
- ));
+ '$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,array(
+ $o = replace_macros($tpl,[
'$filename' => $filename,
'$profile' => intval($_REQUEST['profile']),
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
'$image_url' => System::baseUrl() . '/photo/' . $filename,
- '$title' => t('Crop Image'),
- '$desc' => t('Please adjust the image cropping for optimum viewing.'),
+ '$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' => t('Done Editing')
- ));
+ '$done' => L10n::t('Done Editing')
+ ]);
return $o;
}
return; // NOTREACHED
-}}
+}
-if(! function_exists('profile_photo_crop_ui_head')) {
-function profile_photo_crop_ui_head(App $a, $ph) {
- $max_length = get_config('system','max_image_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) {
- $ph->scaleImage($max_length);
+ $Image->scaleDown($max_length);
}
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ $width = $Image->getWidth();
+ $height = $Image->getHeight();
if ($width < 175 || $height < 175) {
- $ph->scaleImageUp(200);
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ $Image->scaleUp(200);
+ $width = $Image->getWidth();
+ $height = $Image->getHeight();
}
- $hash = photo_new_resource();
+ $hash = Photo::newResource();
$smallest = 0;
+ $filename = '';
- $r = $ph->store(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) {
- $ph->scaleImage(640);
- $r = $ph->store(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;
}
@@ -328,9 +320,8 @@ function profile_photo_crop_ui_head(App $a, $ph) {
$a->config['imagecrop'] = $hash;
$a->config['imagecrop_resolution'] = $smallest;
- $a->config['imagecrop_ext'] = $ph->getExt();
- $a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
- $a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
+ $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;
-}}
-
+}