X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile_photo.php;h=8dc8966532d90e80309cd650403578144b085aa5;hb=e6aaa8b59b138f4195fb7f1e93b9b14980c309c3;hp=b7aaf6c1339902d3f284b6296e57388da0dff229;hpb=d5a13b1e4c0f35445aa539ff6b3779062907a9cb;p=friendica.git

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index b7aaf6c133..8dc8966532 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']);
 
 }
@@ -42,10 +41,10 @@ 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)) {
@@ -53,40 +52,49 @@ function profile_photo_post(&$a) {
 			$base_image = $r[0];
 
 			$im = new Photo($base_image['data']);
-			$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
+			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 );
+				if($r === false)
+					notice ( sprintf(t('Image size reduction [%s] failed.'),"175") . EOL );
 
-			$im->scaleImage(80);
+				$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 );
-
-			// 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())
-			);
+				if($r === false)
+					notice( sprintf(t('Image size reduction [%s] failed.'),"80") . EOL );
 
-			$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-				dbesc(datetime_convert()),
-				intval(get_uid())
-			);
-
-			// 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));
+				$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
 	}
@@ -95,17 +103,122 @@ function profile_photo_post(&$a) {
 	$filename = basename($_FILES['userfile']['name']);
 	$filesize = intval($_FILES['userfile']['size']);
 
+	$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);
 
-	if(! ($image = $ph->getImage())) {
+	if(! $ph->is_valid()) {
 		notice( t('Unable to process image.') . EOL );
 		@unlink($src);
 		return;
 	}
 
 	@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;
+		};
+			
+		$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;
+		}
+		// 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')){
+			$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 = 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) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
+		));
+
+		return $o;
+	}
+	else {
+		$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
+		$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.'),
+			'$done' => t('Done Editing')
+		));
+		return $o;
+	}
+
+	return; // NOTREACHED
+}}
+
+
+if(! function_exists('_crop_ui_head')) {
+function profile_photo_crop_ui_head(&$a, $ph){
 	$width = $ph->getWidth();
 	$height = $ph->getHeight();
 
@@ -120,60 +233,26 @@ 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->page['htmlhead'] .= get_markup_template("crophead.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