X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile_photo.php;h=5b75e654dff95a08a635533f18cf91a30793bc19;hb=54d598ce7c66308dbcf5d5aa0b14b3aec73885a8;hp=4e8d279a972b7ce7ec54b03ee12416a8ec627659;hpb=dfa5183774e24fe2b1a355c9427372d4cd55ea70;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 4e8d279a97..5b75e654df 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,21 +1,27 @@
user['nickname']);
-
}
+function profile_photo_post(App $a) {
-function profile_photo_post(&$a) {
-
- if(! local_user()) {
+ if (! local_user()) {
notice ( t('Permission denied.') . EOL );
return;
}
@@ -32,7 +38,7 @@ function profile_photo_post(&$a) {
intval($_REQUEST['profile']),
intval(local_user())
);
- if(count($r) && (! intval($r[0]['is-default'])))
+ if (DBM::is_result($r) && (! intval($r[0]['is-default'])))
$is_default_profile = 0;
}
@@ -63,32 +69,35 @@ function profile_photo_post(&$a) {
dbesc(local_user()),
intval($scale));
- if(count($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'], t('Profile Photos'), 4, $is_default_profile);
- if($r === false)
+ 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)
+ 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)
+ if ($r === false) {
notice( sprintf(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
@@ -99,15 +108,15 @@ function profile_photo_post(&$a) {
);
$r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s' WHERE `self` AND `uid` = %d",
- dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
- dbesc($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
- dbesc($a->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($a->get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
- dbesc($a->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())
);
@@ -123,18 +132,18 @@ function profile_photo_post(&$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 = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
- if($url && strlen(get_config('system','directory')))
- proc_run('php',"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();
- }
- else
+ Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
+ } else {
notice( t('Unable to process image') . EOL);
+ }
}
- goaway($a->get_baseurl() . '/profiles');
+ goaway(System::baseUrl() . '/profiles');
return; // NOTREACHED
}
@@ -142,21 +151,23 @@ function profile_photo_post(&$a) {
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
$filetype = $_FILES['userfile']['type'];
- if ($filetype=="") $filetype=guess_image_type($filename);
-
- $maximagesize = get_config('system','maximagesize');
+ if ($filetype == "") {
+ $filetype = Image::guessType($filename);
+ }
+
+ $maximagesize = Config::get('system', 'maximagesize');
- if(($maximagesize) && ($filesize > $maximagesize)) {
- notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
+ if (($maximagesize) && ($filesize > $maximagesize)) {
+ 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;
}
@@ -164,18 +175,16 @@ function profile_photo_post(&$a) {
$ph->orient($src);
@unlink($src);
return profile_photo_crop_ui_head($a, $ph);
-
}
-if(! function_exists('profile_photo_content')) {
-function profile_photo_content(&$a) {
+function profile_photo_content(App $a) {
- if(! local_user()) {
+ if (! local_user()) {
notice( t('Permission denied.') . EOL );
return;
}
-
+
$newuser = false;
if($a->argc == 2 && $a->argv[1] === 'new')
@@ -186,21 +195,21 @@ function profile_photo_content(&$a) {
notice( t('Permission denied.') . EOL );
return;
};
-
+
// check_form_security_token_redirectOnErr('/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 (!count($r)){
+ if (!DBM::is_result($r)){
notice( t('Permission denied.') . EOL );
return;
}
$havescale = false;
- foreach($r as $rr) {
+ foreach ($r as $rr) {
if($rr['scale'] == 5)
$havescale = true;
}
@@ -223,13 +232,14 @@ function profile_photo_content(&$a) {
// Update global directory in background
$url = $_SESSION['my_url'];
- if($url && strlen(get_config('system','directory')))
- proc_run('php',"include/directory.php","$url");
+ if ($url && strlen(Config::get('system','directory'))) {
+ Worker::add(PRIORITY_LOW, "Directory", $url);
+ }
- goaway($a->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
}
@@ -240,7 +250,7 @@ function profile_photo_content(&$a) {
if(! x($a->config,'imagecrop')) {
-
+
$tpl = get_markup_template('profile_photo.tpl');
$o .= replace_macros($tpl,array(
@@ -251,7 +261,7 @@ function profile_photo_content(&$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;
@@ -264,7 +274,7 @@ function profile_photo_content(&$a) {
'$filename' => $filename,
'$profile' => intval($_REQUEST['profile']),
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
- '$image_url' => $a->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"),
@@ -274,53 +284,55 @@ function profile_photo_content(&$a) {
}
return; // NOTREACHED
-}}
+}
-if(! function_exists('profile_photo_crop_ui_head')) {
-function profile_photo_crop_ui_head(&$a, $ph){
- $max_length = get_config('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)
- $ph->scaleImage($max_length);
+ }
+ if ($max_length > 0) {
+ $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();
+ if ($width < 175 || $height < 175) {
+ $Image->scaleUp(200);
+ $width = $Image->getWidth();
+ $height = $Image->getHeight();
}
$hash = photo_new_resource();
-
+
$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)
+ if ($r) {
info( t('Image uploaded successfully.') . EOL );
- else
+ } else {
notice( 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 );
- if($width > 640 || $height > 640) {
- $ph->scaleImage(640);
- $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
-
- if($r === false)
+ if ($r === false) {
notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
- else
+ } else {
$smallest = 1;
+ }
}
$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;
-}}
-
+}