X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile_photo.php;h=378353f65377db0e4d9609914c83d29700ac3ca0;hb=49ad9b355c352211375247e6fcacdfd1970599ed;hp=4f0d567f407a265bf0cf8441e8ff532a33f52260;hpb=d322bb461326adac29e4b3a16d6638de74da2348;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 4f0d567f40..378353f653 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -15,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
@@ -51,28 +53,28 @@ function profile_photo_post(&$a) {
$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(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(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( t('Image size reduction [48] failed.') . EOL );
+ notice( sprintf(t('Image size reduction [%s] failed.'),"48") . EOL );
// Unset the profile photo flag from any other photos I own
@@ -86,12 +88,14 @@ function profile_photo_post(&$a) {
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_path,"include/directory.php","$url");
+ proc_run('php',"include/directory.php","$url");
+
+ require_once('include/profile_update.php');
+ profile_change();
}
else
notice( t('Unable to process image') . EOL);
@@ -104,17 +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( t('Image exceeds size limit of ') . $maximagesize . EOL);
+ 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 );
@@ -122,6 +128,7 @@ function profile_photo_post(&$a) {
return;
}
+ $ph->orient($src);
@unlink($src);
return profile_photo_crop_ui_head($a, $ph);
@@ -136,12 +143,19 @@ function profile_photo_content(&$a) {
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",
@@ -152,9 +166,15 @@ function profile_photo_content(&$a) {
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')){
+ if (($r[0]['album']== t('Profile Photos')) && ($havescale)){
$r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
intval(local_user()));
@@ -169,40 +189,46 @@ function profile_photo_content(&$a) {
);
// Update global directory in background
- $php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
- //proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",array(),$foo));
- proc_run($php_path,"include/directory.php","$url");
+ proc_run('php',"include/directory.php","$url");
goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED
}
- $ph = new Photo($r[0]['data']);
+ $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 = load_view_file('view/profile_photo.tpl');
+ $tpl = get_markup_template('profile_photo.tpl');
$o .= replace_macros($tpl,array(
- '$user' => $a->user['nickname']
+ '$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'] . '.jpg';
+ $filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.'.$a->config['imagecrop_ext'];
$resolution = $a->config['imagecrop_resolution'];
- $tpl = load_view_file("view/cropbody.tpl");
+ $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
- ));
-
+ '$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;
}
@@ -212,6 +238,12 @@ function profile_photo_content(&$a) {
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();
@@ -229,7 +261,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
$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 );
@@ -238,14 +270,16 @@ function profile_photo_crop_ui_head(&$a, $ph){
$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;
}}