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

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 36657ba14e..39808776b7 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -4,18 +4,20 @@ require_once("Photo.php");
 
 function profile_photo_init(&$a) {
 
-	if((! local_user()) {
+	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((! local_user()) {
-                notice ( "Permission denied." . EOL );
+        if(! local_user()) {
+                notice ( t('Permission denied.') . EOL );
                 return;
         }
 
@@ -24,7 +26,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 +45,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 +53,51 @@ 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($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);
+			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);
 
-			// Unset the profile photo flag from any other photos I own
+				if($r === false)
+					notice ( t('Image size reduction [175] failed.') . 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( 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
 	}
@@ -103,11 +106,19 @@ 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( t('Image exceeds size limit of ') . $maximagesize . EOL);
+		@unlink($src);
+		return;
+	}
+
 	$imagedata = @file_get_contents($src);
 	$ph = new Photo($imagedata);
 
-	if(! ($image = $ph->getImage())) {
-		notice("Unable to process image." . EOL);
+	if(! $ph->is_valid()) {
+		notice( t('Unable to process image.') . EOL );
 		@unlink($src);
 		return;
 	}
@@ -123,54 +134,31 @@ function profile_photo_post(&$a) {
 		$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)
-		notice("Image uploaded successfully." . EOL);
+		notice( t('Image uploaded successfully.') . EOL );
 	else
-		notice("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($ph->getHeight()),
-			intval($ph->getWidth()),
-			dbesc($ph->imageString()
-		);
 		if($r === false)
-			notice("Image size reduction (640) failed." . EOL );
+			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;
 }
 
@@ -179,13 +167,13 @@ if(! function_exists('profile_photo_content')) {
 function profile_photo_content(&$a) {
 
 	if(! local_user()) {
-		notice("Permission denied." . EOL );
+		notice( t('Permission denied.') . EOL );
 		return;
 	}
 
 	if(! x($a->config,'imagecrop')) {
 	
-		$tpl = file_get_contents('view/profile_photo.tpl');
+		$tpl = load_view_file('view/profile_photo.tpl');
 
 		$o .= replace_macros($tpl,array(
 
@@ -196,7 +184,7 @@ 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 = load_view_file("view/cropbody.tpl");
 		$o .= replace_macros($tpl,array(
 			'$filename' => $filename,
 			'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],