a bit more robust about loading external pics

also friend confirm was getting wrong email

4 files changed, 45 insertions, 42 deletions

diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 5808b6fec..43e28aef8 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -26,7 +26,7 @@ function dfrn_confirm_post(&$a) {
 
 		if(! count($r)) {
 			xml_status(3); // failure
-			return; // NOTREACHED
+			// NOTREACHED
 		}
 
 		$my_prvkey = $r[0]['prvkey'];
@@ -73,7 +73,7 @@ function dfrn_confirm_post(&$a) {
 		);
 		if(count($r)) {
 			xml_status(1); // Birthday paradox - duplicate dfrn-id
-			return; // NOTREACHED
+			// NOTREACHED
 		}
 
 		$r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d LIMIT 1",
@@ -96,7 +96,7 @@ function dfrn_confirm_post(&$a) {
 				$filename = basename($r[0]['photo']);
 				$img_str = fetch_url($r[0]['photo'],true);
 				$img = new Photo($img_str);
-				if($img) {
+				if($img->is_valid()) {
 
 					$img->scaleImageSquare(175);
 					
@@ -164,7 +164,7 @@ function dfrn_confirm_post(&$a) {
 			);
 			if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
 
-				$tpl = (($new_relation == $REL_BUD) 
+				$tpl = (($new_relation == REL_BUD) 
 					? load_view_file('view/friend_complete_eml.tpl')
 					: load_view_file('view/intro_complete_eml.tpl'));
 			
@@ -185,7 +185,7 @@ function dfrn_confirm_post(&$a) {
 				}
 			}
 			xml_status(0); // Success
-			return; // NOTREACHED
+			// NOTREACHED
 		}
 		else {
 			xml_status(2);	// Hopefully temporary problem that can be retried.
@@ -201,7 +201,7 @@ function dfrn_confirm_post(&$a) {
 		$uid = get_uid();
 
 		if(! $uid) {
-			notice( t("Permission denied.") . EOL );
+			notice( t('Permission denied.') . EOL );
 			return;
 		}	
 	
@@ -329,7 +329,7 @@ function dfrn_confirm_post(&$a) {
 			$filename = basename($r[0]['photo']);
 			$img_str = fetch_url($r[0]['photo'],true);
 			$img = new Photo($img_str);
-			if($img) {
+			if($img->is_valid()) {
 
 				$img->scaleImageSquare(175);
 					
diff --git a/mod/photos.php b/mod/photos.php
index 345a22d50..052f3c185 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -287,7 +287,7 @@ function photos_post(&$a) {
 	$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);
 		killme();
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index bc2e5b4ea..07df671da 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -53,39 +53,42 @@ 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(get_uid(), 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 ( t('Image size reduction [175] failed.') . 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(get_uid(), 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())
-			);
-
-			$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));
-
+				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())
+				);
+
+				$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));
+			}
+			else
+				notice( t('Unable to process image') . EOL);
 		}
 		goaway($a->get_baseurl() . '/profiles');
 		return; // NOTREACHED
@@ -98,7 +101,7 @@ function profile_photo_post(&$a) {
 	$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;
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 257235d62..9875a01ad 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -4,10 +4,10 @@ require_once('Photo.php');
 
 function wall_upload_post(&$a) {
 
-        if(! local_user()) {
-                echo ( t('Permission denied.') . EOL );
-                killme();
-        }
+	if(! local_user()) {
+		echo ( t('Permission denied.') . EOL );
+		killme();
+	}
 
 	if(! x($_FILES,'userfile'))
 		killme();
@@ -19,7 +19,7 @@ function wall_upload_post(&$a) {
 	$imagedata = @file_get_contents($src);
 	$ph = new Photo($imagedata);
 
-	if(! ($image = $ph->getImage())) {
+	if(! $ph->is_valid()) {
 		echo ( t('Unable to process image.') . EOL);
 		@unlink($src);
 		killme();