X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=4de3aaa3e0c255e007d1b7590e9ef9ae3ecd788e;hb=906addf865ccab2c98d5035fc6c1b10d43004dfe;hp=9a694971dbebd5824d8b1cb4771cc695ff3f4102;hpb=466267fbb5b5cc466196e40b6a8fe96f25c57e2f;p=friendica.git
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 9a694971db..4de3aaa3e0 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -7,15 +7,16 @@ function profile_photo_init(&$a) {
if(! local_user()) {
return;
}
- require_once("mod/profile.php");
+
profile_load($a,$a->user['nickname']);
+
}
function profile_photo_post(&$a) {
if(! local_user()) {
- notice ( "Permission denied." . EOL );
+ notice ( t('Permission denied.') . EOL );
return;
}
@@ -24,7 +25,7 @@ function profile_photo_post(&$a) {
// phase 2 - we have finished cropping
if($a->argc != 2) {
- notice( "Image uploaded but image cropping failed." . EOL );
+ notice( t('Image uploaded but image cropping failed.') . EOL );
return;
}
@@ -43,7 +44,7 @@ function profile_photo_post(&$a) {
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1",
dbesc($image_id),
- dbesc($_SESSION['uid']),
+ dbesc(local_user()),
intval($scale));
if(count($r)) {
@@ -51,50 +52,49 @@ function profile_photo_post(&$a) {
$base_image = $r[0];
$im = new Photo($base_image['data']);
- $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
-
- $ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`,
- `height`, `width`, `data`, `scale`, `profile` )
- VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 4, 1 )",
- intval($_SESSION['uid']),
- dbesc($base_image['resource-id']),
- datetime_convert(),
- datetime_convert(),
- dbesc($base_image['filename']),
- intval($im->getHeight()),
- intval($im->getWidth()),
- dbesc($im->imageString())
- );
+ if($im->is_valid()) {
+ $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
- if($r === false)
- notice ("Image size reduction (175) failed." . EOL );
-
- $im->scaleImage(80);
-
- $ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`,
- `height`, `width`, `data`, `scale`, `profile` )
- VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 5, 1 )",
- intval($_SESSION['uid']),
- dbesc($base_image['resource-id']),
- datetime_convert(),
- datetime_convert(),
- dbesc($base_image['filename']),
- intval($im->getHeight()),
- intval($im->getWidth()),
- dbesc($im->imageString())
- );
-
- if($r === false)
- notice("Image size reduction (80) failed." . EOL);
+ $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
- // Unset the profile photo flag from any other photos I own
+ if($r === false)
+ notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
- $r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
- dbesc($base_image['resource-id']),
- intval($_SESSION['uid'])
- );
+ $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( 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(local_user())
+ );
+
+ $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 = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
+ if($url && strlen(get_config('system','directory_submit_url')))
+ proc_run('php',"include/directory.php","$url");
+ }
+ else
+ notice( t('Unable to process image') . EOL);
}
+
goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED
}
@@ -103,75 +103,26 @@ function profile_photo_post(&$a) {
$filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']);
- $imagedata = @file_get_contents($src);
- $ph = new Photo($imagedata);
+ $maximagesize = get_config('system','maximagesize');
- if(! ($image = $ph->getImage())) {
- notice("Unable to process image." . EOL);
+ if(($maximagesize) && ($filesize > $maximagesize)) {
+ notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL);
@unlink($src);
return;
}
- @unlink($src);
-
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ $imagedata = @file_get_contents($src);
+ $ph = new Photo($imagedata);
- if($width < 175 || $height < 175) {
- $ph->scaleImageUp(200);
- $width = $ph->getWidth();
- $height = $ph->getHeight();
+ if(! $ph->is_valid()) {
+ notice( t('Unable to process image.') . EOL );
+ @unlink($src);
+ return;
}
- $hash = hash('md5',uniqid(mt_rand(),true));
+ @unlink($src);
+ return profile_photo_crop_ui_head($a, $ph);
- $str_image = $ph->imageString();
- $smallest = 0;
-
- $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`,
- `height`, `width`, `data`, `scale` )
- VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 0 )",
- intval($_SESSION['uid']),
- dbesc($hash),
- datetime_convert(),
- datetime_convert(),
- dbesc(basename($filename)),
- intval($height),
- intval($width),
- dbesc($str_image));
- if($r)
- notice("Image uploaded successfully." . EOL);
- else
- notice("Image upload failed." . EOL);
-
- if($width > 640 || $height > 640) {
- $ph->scaleImage(640);
- $str_image = $ph->imageString();
- $width = $ph->getWidth();
- $height = $ph->getHeight();
-
- $r = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`,
- `height`, `width`, `data`, `scale` )
- VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 1 )",
- intval($_SESSION['uid']),
- dbesc($hash),
- datetime_convert(),
- datetime_convert(),
- dbesc(basename($filename)),
- intval($ph->getHeight()),
- intval($ph->getWidth()),
- dbesc($ph->imageString())
- );
- if($r === false)
- notice("Image size reduction (640) failed." . EOL );
- else
- $smallest = 1;
- }
-
- $a->config['imagecrop'] = $hash;
- $a->config['imagecrop_resolution'] = $smallest;
- $a->page['htmlhead'] .= file_get_contents("view/crophead.tpl");
- return;
}
@@ -179,16 +130,76 @@ if(! function_exists('profile_photo_content')) {
function profile_photo_content(&$a) {
if(! local_user()) {
- notice("Permission denied." . EOL );
+ 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;
+ };
+
+ $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']);
+ 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 = file_get_contents('view/profile_photo.tpl');
+ $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'),
+ '$select' => sprintf('%s %s', t('or'), ($newuser) ? '' . t('skip this step') . '' : '' . t('select a photo from your photo albums') . '')
));
return $o;
@@ -196,15 +207,58 @@ function profile_photo_content(&$a) {
else {
$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
$resolution = $a->config['imagecrop_resolution'];
- $tpl = file_get_contents("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.'),
+ '$done' => t('Done Editing')
+ ));
return $o;
}
return; // NOTREACHED
-}}
\ No newline at end of file
+}}
+
+
+if(! function_exists('_crop_ui_head')) {
+function profile_photo_crop_ui_head(&$a, $ph){
+ $width = $ph->getWidth();
+ $height = $ph->getHeight();
+
+ if($width < 175 || $height < 175) {
+ $ph->scaleImageUp(200);
+ $width = $ph->getWidth();
+ $height = $ph->getHeight();
+ }
+
+ $hash = photo_new_resource();
+
+
+ $smallest = 0;
+
+ $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
+
+ if($r)
+ info( t('Image uploaded successfully.') . EOL );
+ else
+ notice( 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 );
+
+ if($r === false)
+ 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'] .= get_markup_template("crophead.tpl");
+ return;
+}}
+