X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile_photo.php;h=378353f65377db0e4d9609914c83d29700ac3ca0;hb=49ad9b355c352211375247e6fcacdfd1970599ed;hp=07df671da46e101dcaa76992a90f682ea91eab7d;hpb=8424f31aad844b49e74e0fb7a7d197284fb67ec9;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 07df671da4..378353f653 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -8,7 +8,6 @@ function profile_photo_init(&$a) {
return;
}
- require_once("mod/profile.php");
profile_load($a,$a->user['nickname']);
}
@@ -16,11 +15,13 @@ function profile_photo_init(&$a) {
function profile_photo_post(&$a) {
- if(! local_user()) {
- notice ( t('Permission denied.') . EOL );
- return;
- }
-
+ if(! local_user()) {
+ notice ( t('Permission denied.') . EOL );
+ return;
+ }
+
+ check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+
if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
// phase 2 - we have finished cropping
@@ -42,54 +43,64 @@ function profile_photo_post(&$a) {
$srcY = $_POST['ystart'];
$srcW = $_POST['xfinal'] - $srcX;
$srcH = $_POST['yfinal'] - $srcY;
-//dbg(3);
+
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1",
dbesc($image_id),
- dbesc(get_uid()),
+ dbesc(local_user()),
intval($scale));
if(count($r)) {
$base_image = $r[0];
- $im = new Photo($base_image['data']);
+ $im = new Photo($base_image['data'], $base_image['type']);
if($im->is_valid()) {
$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
- $r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
+ $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
if($r === false)
- notice ( t('Image size reduction [175] failed.') . EOL );
+ notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
$im->scaleImage(80);
- $r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
+ $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
if($r === false)
- notice( t('Image size reduction [80] failed.') . EOL );
+ notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
+
+ $im->scaleImage(48);
+
+ $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 6, 1);
+
+ if($r === false)
+ notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
// Unset the profile photo flag from any other photos I own
$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
dbesc($base_image['resource-id']),
- intval(get_uid())
+ intval(local_user())
);
$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
dbesc(datetime_convert()),
- intval(get_uid())
+ intval(local_user())
);
+ info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background
- $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
- $url = $_SESSION['my_url'];
+ $url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
if($url && strlen(get_config('system','directory_submit_url')))
- proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
- array(),$foo));
+ proc_run('php',"include/directory.php","$url");
+
+ require_once('include/profile_update.php');
+ profile_change();
}
else
notice( t('Unable to process image') . EOL);
}
+
goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED
}
@@ -97,9 +108,19 @@ function profile_photo_post(&$a) {
$src = $_FILES['userfile']['tmp_name'];
$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(($maximagesize) && ($filesize > $maximagesize)) {
+ notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL);
+ @unlink($src);
+ return;
+ }
$imagedata = @file_get_contents($src);
- $ph = new Photo($imagedata);
+ $ph = new Photo($imagedata, $filetype);
if(! $ph->is_valid()) {
notice( t('Unable to process image.') . EOL );
@@ -107,7 +128,121 @@ function profile_photo_post(&$a) {
return;
}
+ $ph->orient($src);
@unlink($src);
+ return profile_photo_crop_ui_head($a, $ph);
+
+}
+
+
+if(! function_exists('profile_photo_content')) {
+function profile_photo_content(&$a) {
+
+ if(! local_user()) {
+ notice( t('Permission denied.') . EOL );
+ return;
+ }
+
+ $newuser = false;
+
+ 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;
+ };
+
+// 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)){
+ notice( t('Permission denied.') . EOL );
+ return;
+ }
+ $havescale = false;
+ foreach($r as $rr) {
+ 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)
+ );
+
+ $r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+ dbesc(datetime_convert()),
+ intval(local_user())
+ );
+
+ // Update global directory in background
+ $url = $_SESSION['my_url'];
+ if($url && strlen(get_config('system','directory_submit_url')))
+ proc_run('php',"include/directory.php","$url");
+
+ goaway($a->get_baseurl() . '/profiles');
+ return; // NOTREACHED
+ }
+ $ph = new Photo($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
+ }
+
+ if(! x($a->config,'imagecrop')) {
+
+ $tpl = get_markup_template('profile_photo.tpl');
+
+ $o .= replace_macros($tpl,array(
+ '$user' => $a->user['nickname'],
+ '$lbl_upfile' => t('Upload File:'),
+ '$title' => t('Upload Profile Photo'),
+ '$submit' => t('Upload'),
+ '$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') . '')
+ ));
+
+ 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(
+ '$filename' => $filename,
+ '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
+ '$image_url' => $a->get_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')
+ ));
+ return $o;
+ }
+
+ return; // NOTREACHED
+}}
+
+
+if(! function_exists('_crop_ui_head')) {
+function profile_photo_crop_ui_head(&$a, $ph){
+ $max_length = get_config('system','max_image_length');
+ if(! $max_length)
+ $max_length = MAX_IMAGE_LENGTH;
+ if($max_length > 0)
+ $ph->scaleImage($max_length);
$width = $ph->getWidth();
$height = $ph->getHeight();
@@ -123,60 +258,28 @@ function profile_photo_post(&$a) {
$smallest = 0;
- $r = $ph->store(get_uid(), 0 , $hash, $filename, t('Profile Photos'), 0 );
+ $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
if($r)
- notice( t('Image uploaded successfully.') . EOL );
+ info( t('Image uploaded successfully.') . EOL );
else
notice( t('Image upload failed.') . EOL );
if($width > 640 || $height > 640) {
$ph->scaleImage(640);
- $r = $ph->store(get_uid(), 0 , $hash, $filename, t('Profile Photos'), 1 );
-
+ $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
+
if($r === false)
- notice( t('Image size reduction [640] failed.') . EOL );
+ notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
else
$smallest = 1;
}
$a->config['imagecrop'] = $hash;
$a->config['imagecrop_resolution'] = $smallest;
- $a->page['htmlhead'] .= load_view_file("view/crophead.tpl");
+ $a->config['imagecrop_ext'] = $ph->getExt();
+ $a->page['htmlhead'] .= get_markup_template("crophead.tpl");
+ $a->page['end'] .= get_markup_template("cropend.tpl");
return;
-}
-
-
-if(! function_exists('profile_photo_content')) {
-function profile_photo_content(&$a) {
-
- if(! local_user()) {
- notice( t('Permission denied.') . EOL );
- return;
- }
-
- if(! x($a->config,'imagecrop')) {
-
- $tpl = load_view_file('view/profile_photo.tpl');
-
- $o .= replace_macros($tpl,array(
+}}
- ));
-
- return $o;
- }
- else {
- $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
- $resolution = $a->config['imagecrop_resolution'];
- $tpl = load_view_file("view/cropbody.tpl");
- $o .= replace_macros($tpl,array(
- '$filename' => $filename,
- '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
- '$image_url' => $a->get_baseurl() . '/photo/' . $filename
- ));
-
- return $o;
- }
-
- return; // NOTREACHED
-}}
\ No newline at end of file