X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile_photo.php;h=5b75e654dff95a08a635533f18cf91a30793bc19;hb=c54a2c1e83822f6e043b449468570d2c9ed3ab3a;hp=8b3d3d371e24ea1d0907cb0addfca14da7e3fb43;hpb=56ee734b00aead633d5d213a6b140b75bc17ba96;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 8b3d3d371e..5b75e654df 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,6 +1,14 @@
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'], t('Profile Photos'), 4, $is_default_profile);
if ($r === false) {
notice ( sprintf(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'], t('Profile Photos'), 5, $is_default_profile);
if ($r === false) {
notice( sprintf(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'], t('Profile Photos'), 6, $is_default_profile);
if ($r === false) {
notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
@@ -100,15 +108,15 @@ function profile_photo_post(App $a) {
);
$r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d",
- dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
- dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
- dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
+ 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())
);
} else {
$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
- dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
- dbesc(App::get_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())
);
@@ -124,19 +132,18 @@ function profile_photo_post(App $a) {
info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background
- $url = App::get_baseurl() . '/profile/' . $a->user['nickname'];
- if ($url && strlen(get_config('system','directory'))) {
- proc_run(PRIORITY_LOW, "include/directory.php", $url);
+ $url = System::baseUrl() . '/profile/' . $a->user['nickname'];
+ if ($url && strlen(Config::get('system','directory'))) {
+ Worker::add(PRIORITY_LOW, "Directory", $url);
}
- require_once('include/profile_update.php');
- profile_change();
+ Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
} else {
notice( t('Unable to process image') . EOL);
}
}
- goaway(App::get_baseurl() . '/profiles');
+ goaway(System::baseUrl() . '/profiles');
return; // NOTREACHED
}
@@ -145,22 +152,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(sprintf(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(t('Unable to process image.') . EOL);
@unlink($src);
return;
}
@@ -171,7 +178,6 @@ function profile_photo_post(App $a) {
}
-if(! function_exists('profile_photo_content')) {
function profile_photo_content(App $a) {
if (! local_user()) {
@@ -198,7 +204,7 @@ function profile_photo_content(App $a) {
intval(local_user()),
dbesc($resource_id)
);
- if (!dbm::is_result($r)){
+ if (!DBM::is_result($r)){
notice( t('Permission denied.') . EOL );
return;
}
@@ -226,14 +232,14 @@ function profile_photo_content(App $a) {
// 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(App::get_baseurl() . '/profiles');
+ 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
}
@@ -255,7 +261,7 @@ function profile_photo_content(App $a) {
'$submit' => 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', t('or'), ($newuser) ? '' . t('skip this step') . '' : '' . t('select a photo from your photo albums') . '')
));
return $o;
@@ -268,7 +274,7 @@ function profile_photo_content(App $a) {
'$filename' => $filename,
'$profile' => intval($_REQUEST['profile']),
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
- '$image_url' => App::get_baseurl() . '/photo/' . $filename,
+ '$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"),
@@ -278,26 +284,25 @@ function profile_photo_content(App $a) {
}
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();
@@ -305,7 +310,7 @@ function profile_photo_crop_ui_head(App $a, $ph) {
$smallest = 0;
- $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
+ $r = Photo::store($Image, local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
if ($r) {
info( t('Image uploaded successfully.') . EOL );
@@ -314,8 +319,8 @@ function profile_photo_crop_ui_head(App $a, $ph) {
}
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, t('Profile Photos'), 1 );
if ($r === false) {
notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
@@ -326,9 +331,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->config['imagecrop_ext'] = $Image->getExt();
$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), array());
return;
-}}
-
+}