X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fprofile_photo.php;h=39808776b7e4fad331db8a0cc9028221b3f73a97;hb=f9f08b435589ea10dca2db6891ae885a66e831e4;hp=f7e6825ae7d2625d25756b9a358896a932d1e6da;hpb=6348e70daa113e8b3203de8fbc919d08c90d972e;p=friendica.git

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index f7e6825ae7..39808776b7 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -4,35 +4,34 @@ require_once("Photo.php");
 
 function profile_photo_init(&$a) {
 
-	if((! x($_SESSION,'authenticated')) && (x($_SESSION,'uid'))) {
-		$_SESSION['sysmsg'] .= "Permission denied." . EOL;
-		$a->error = 404;
+	if(! local_user()) {
 		return;
 	}
+
 	require_once("mod/profile.php");
-	profile_load($a,$_SESSION['uid']);
+	profile_load($a,$a->user['nickname']);
+
 }
 
 
 function profile_photo_post(&$a) {
 
-
-
-        if((! x($_SESSION,'authenticated')) && (! (x($_SESSION,'uid')))) {
-                $_SESSION['sysmsg'] .= "Permission denied." . EOL;
+        if(! local_user()) {
+                notice ( t('Permission denied.') . EOL );
                 return;
         }
 
-        if($a->argc > 1)
-                $profile_id = intval($a->argv[1]);
+	if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
 
-	if(x($_POST,'xstart') !== false) {
 		// phase 2 - we have finished cropping
-		if($a->argc != 3) {
-			$_SESSION['sysmsg'] .= "Image uploaded but image cropping failed." . EOL;
+
+		if($a->argc != 2) {
+			notice( t('Image uploaded but image cropping failed.') . EOL );
 			return;
 		}
-		$image_id = $a->argv[2];
+
+		$image_id = $a->argv[1];
+
 		if(substr($image_id,-2,1) == '-') {
 			$scale = substr($image_id,-1,1);
 			$image_id = substr($image_id,0,-2);
@@ -44,178 +43,150 @@ function profile_photo_post(&$a) {
 		$srcW = $_POST['xfinal'] - $srcX;
 		$srcH = $_POST['yfinal'] - $srcY;
 
-		$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d LIMIT 1",
+		$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1",
 			dbesc($image_id),
+			dbesc(local_user()),
 			intval($scale));
-		if($r !== NULL && (count($r))) {
-			$im = new Photo($r[0]['data']);
-			$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
-			$s = $im->imageString(); 
-			$x = $im->getWidth();
-			$y = $im->getHeight();
-
-			$ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
-				`height`, `width`, `data`, `scale` )
-				VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 4 )",
-				intval($_SESSION['uid']),
-				dbesc($r[0]['resource-id']),
-				datetime_convert(),
-				datetime_convert(),
-				dbesc($r[0]['filename']),
-				intval($y),
-				intval($x),
-				dbesc($s));
-			if($r === NULL)
-				$_SESSION['sysmsg'] .= "Image size reduction (175) failed." . EOL;
-
-			$im->scaleImage(80);
-			$s = $im->imageString();
-			$x = $im->getWidth();
-			$y = $im->getHeight();
-			$ret = q("INSERT INTO `photo` ( `uid`, `resource-id`, `created`, `edited`, `filename`, 
-				`height`, `width`, `data`, `scale` )
-				VALUES ( %d, '%s', '%s', '%s', '%s', %d, %d, '%s', 5 )",
-				intval($_SESSION['uid']),
-				dbesc($r[0]['resource-id']),
-				datetime_convert(),
-				datetime_convert(),
-				dbesc($r[0]['filename']),
-				intval($y),
-				intval($x),
-				dbesc($s));
-			if($r === NULL)
-				$_SESSION['sysmsg'] .= "Image size reduction (80) failed." . EOL;
-			$r = q("UPDATE `profile` SET `photo` = '%s', `thumb` = '%s' WHERE `id` = %d LIMIT 1",
-				dbesc($a->get_baseurl() . '/photo/' . $image_id . '-4.jpg'),
-				dbesc($a->get_baseurl() . '/photo/' . $image_id . '-5.jpg'),
-				intval($profile_id));
-			if($r === NULL)
-				$_SESSION['sysmsg'] .= "Failed to add image to profile." . EOL;
 
-		}
-		goaway($a->get_baseurl() . '/profiles');
-	}
+		if(count($r)) {
 
-        $extra_sql = (($profile_id) ? " AND `id` = " . intval($profile_id)  : " AND `is-default` = 1 " );
+			$base_image = $r[0];
 
+			$im = new Photo($base_image['data']);
+			if($im->is_valid()) {
+				$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
-        $r = q("SELECT `id` FROM `profile` WHERE `uid` = %d $extra_sql LIMIT 1", intval($_SESSION['uid']));
-        if($r === NULL || (! count($r))) {
-                $_SESSION['sysmsg'] .= "Profile unavailable." . EOL;
-                return;
-        }
+				$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 );
+
+				$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 );
+
+				$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 );
+
+				// 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
+				$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));
+			}
+			else
+				notice( t('Unable to process image') . EOL);
+		}
+
+		goaway($a->get_baseurl() . '/profiles');
+		return; // NOTREACHED
+	}
 
 	$src      = $_FILES['userfile']['tmp_name'];
 	$filename = basename($_FILES['userfile']['name']);
 	$filesize = intval($_FILES['userfile']['size']);
 
+	$maximagesize = get_config('system','maximagesize');
+
+	if(($maximagesize) && ($filesize > $maximagesize)) {
+		notice( t('Image exceeds size limit of ') . $maximagesize . EOL);
+		@unlink($src);
+		return;
+	}
+
 	$imagedata = @file_get_contents($src);
 	$ph = new Photo($imagedata);
 
-	if(! ($image = $ph->getImage())) {
-		$_SESSION['sysmsg'] .= "Unable to process image." . EOL;
+	if(! $ph->is_valid()) {
+		notice( t('Unable to process image.') . EOL );
 		@unlink($src);
 		return;
 	}
 
 	@unlink($src);
+
 	$width = $ph->getWidth();
 	$height = $ph->getHeight();
 
-	if($width < 175 || $width < 175) {
+	if($width < 175 || $height < 175) {
 		$ph->scaleImageUp(200);
 		$width = $ph->getWidth();
 		$height = $ph->getHeight();
 	}
 
-	$hash = hash('md5',uniqid(mt_rand(),true));
+	$hash = photo_new_resource();
 	
-	$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));
+
+	$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );	
+
 	if($r)
-		$_SESSION['sysmsg'] .= "Image uploaded successfully." . EOL;
+		notice( t('Image uploaded successfully.') . EOL );
 	else
-		$_SESSION['sysmsg'] .= "Image upload failed." . EOL;
+		notice( t('Image upload failed.') . EOL );
 
 	if($width > 640 || $height > 640) {
 		$ph->scaleImage(640);
-		$str_image = $ph->imageString();
-		$width = $ph->getWidth();
-		$height = $ph->getHeight();
+		$r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );	
 
-		$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($height),
-			intval($width),
-			dbesc($str_image));
-		if($r === NULL)
-			$_SESSION['sysmsg'] .= "Image size reduction (640) failed." . EOL;
+		if($r === false)
+			notice( t('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");
-
+	$a->page['htmlhead'] .= load_view_file("view/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')) {
-		if((! x($_SESSION['authenticated'])) && (! (x($_SESSION,'uid')))) {
-			$_SESSION['sysmsg'] .= "Permission denied." . EOL;
-			return;
-		}
-	
-		if($a->argc > 1)
-			$profile_id = intval($a->argv[1]);
 	
-		$extra_sql = (($profile_id) ? " AND `id` = $profile_id " : " AND `is-default` = 1 " );
+		$tpl = load_view_file('view/profile_photo.tpl');
 
+		$o .= replace_macros($tpl,array(
 
-		$r = q("SELECT `id` FROM `profile` WHERE `uid` = %d $extra_sql LIMIT 1", intval($_SESSION['uid']));
-		if($r === NULL || (! count($r))) {
-			$_SESSION['sysmsg'] .= "Profile unavailable." . EOL;
-			return;
-		}
-	
-		$o = file_get_contents('view/profile_photo.tpl');
-
-		$o = replace_macros($o,array(
-			'$profile_id' => $r[0]['id'],
-			'$uid' => $_SESSION['uid'],
-			));
+		));
 
 		return $o;
 	}
 	else {
 		$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.jpg';
 		$resolution = $a->config['imagecrop_resolution'];
-		$o = file_get_contents("view/cropbody.tpl");
-		$o = replace_macros($o,array(
+		$tpl = load_view_file("view/cropbody.tpl");
+		$o .= replace_macros($tpl,array(
 			'$filename' => $filename,
-			'$profile_id' => $a->argv[1],
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
 			'$image_url' => $a->get_baseurl() . '/photo/' . $filename
 			));
@@ -223,5 +194,5 @@ function profile_photo_content(&$a) {
 		return $o;
 	}
 
-
+	return; // NOTREACHED
 }}
\ No newline at end of file