1 files changed, 42 insertions, 65 deletions

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index c70e8fc94..13923a655 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -143,7 +143,7 @@ function profile_photo_post(&$a) {
 					'filename' => $base_image['filename'], 'album' => t('Profile Photos'));
 
 				$p['scale'] = 4;
-				$p['photo_flags'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
+				$p['photo_usage'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
 
 				$r1 = $im->save($p);
 
@@ -170,13 +170,9 @@ function profile_photo_post(&$a) {
 				// If setting for the default profile, unset the profile photo flag from any other photos I own
 
 				if($is_default_profile) {
-					$r = q("UPDATE photo SET profile = 0 WHERE profile = 1 AND resource_id != '%s' AND `uid` = %d",
-						dbesc($base_image['resource_id']),
-						intval(local_channel())
-					);
-					$r = q("UPDATE photo SET photo_flags = ( photo_flags & ~%d ) WHERE ( photo_flags & %d )>0 
+					$r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d
 						AND resource_id != '%s' AND `uid` = %d",
-						intval(PHOTO_PROFILE),
+						intval(PHOTO_NORMAL),
 						intval(PHOTO_PROFILE),
 						dbesc($base_image['resource_id']),
 						intval(local_channel())
@@ -221,31 +217,45 @@ function profile_photo_post(&$a) {
 		return; // NOTREACHED
 	}
 
-	$src      = $_FILES['userfile']['tmp_name'];
-	$filename = basename($_FILES['userfile']['name']);
-	$filesize = intval($_FILES['userfile']['size']);
-	$filetype = $_FILES['userfile']['type'];
-    if ($filetype=="") $filetype=guess_image_type($filename);
-    
-	$maximagesize = get_config('system','maximagesize');
-
-	if(($maximagesize) && ($filesize > $maximagesize)) {
-		notice( sprintf(t('Image exceeds size limit of %d'), $maximagesize) . EOL);
-		@unlink($src);
-		return;
+
+
+	$hash = photo_new_resource();
+	$smallest = 0;
+
+	require_once('include/attach.php');
+
+	$res = attach_store($a->get_channel(), get_observer_hash(), '', array('album' => t('Profile Photos'), 'hash' => $hash));
+
+	logger('attach_store: ' . print_r($res,true));
+
+	if($res && intval($res['data']['is_photo'])) {
+		$i = q("select * from photo where resource_id = '%s' and uid = %d order by scale",
+			dbesc($hash),
+			intval(local_channel())
+		);
+
+		if(! $i) {
+			notice( t('Image upload failed.') . EOL );
+			return;
+		}
+		foreach($i as $ii) {
+			if(intval($ii['scale']) < 2) {
+				$smallest = intval($ii['scale']);
+				$imagedata = $ii['data'];
+				$filetype = $ii['type'];
+			}
+		}
 	}
 
-	$imagedata = @file_get_contents($src);
+//	$imagedata = @file_get_contents($src);
 	$ph = photo_factory($imagedata, $filetype);
 
 	if(! $ph->is_valid()) {
 		notice( t('Unable to process image.') . EOL );
-		@unlink($src);
 		return;
 	}
-	$ph->orient($src);
-	@unlink($src);
-	return profile_photo_crop_ui_head($a, $ph);
+
+	return profile_photo_crop_ui_head($a, $ph, $hash, $smallest);
 	
 }
 
@@ -257,7 +267,6 @@ function profile_photo_post(&$a) {
  */
 
 
-if(! function_exists('profile_photo_content')) {
 function profile_photo_content(&$a) {
 
 	if(! local_channel()) {
@@ -301,20 +310,12 @@ function profile_photo_content(&$a) {
 
 		if(($r[0]['album'] == t('Profile Photos')) && ($havescale)) {
 			// unset any existing profile photos
-			$r = q("UPDATE photo SET profile = 0 WHERE profile = 1 AND uid = %d",
-				intval(local_channel()));
-			$r = q("UPDATE photo SET photo_flags = (photo_flags & ~%d ) WHERE (photo_flags & %d )>0 AND uid = %d",
-				intval(PHOTO_PROFILE),
+			$r = q("UPDATE photo SET photo_usage = %d WHERE photo_usage = %d AND uid = %d",
+				intval(PHOTO_NORMAL),
 				intval(PHOTO_PROFILE),
 				intval(local_channel()));
 
-			// set all sizes of this one as profile photos
-			$r = q("UPDATE photo SET profile = 1 WHERE uid = %d AND resource_id = '%s'",
-				intval(local_channel()),
-				dbesc($resource_id)
-				);
-
-			$r = q("UPDATE photo SET photo_flags = ( photo_flags | %d ) WHERE uid = %d AND resource_id = '%s'",
+			$r = q("UPDATE photo SET photo_usage = %d WHERE uid = %d AND resource_id = '%s'",
 				intval(PHOTO_PROFILE),
 				intval(local_channel()),
 				dbesc($resource_id)
@@ -371,7 +372,7 @@ function profile_photo_content(&$a) {
 		return $o;
 	}
 	else {
-		$filename = $a->data['imagecrop'] . '-' . $a->data['imagecrop_resolution'] . '.' . $a->data['imagecrop_ext'];
+		$filename = $a->data['imagecrop'] . '-' . $a->data['imagecrop_resolution'];
 		$resolution = $a->data['imagecrop_resolution'];
 		$tpl = get_markup_template("cropbody.tpl");
 		$o .= replace_macros($tpl,array(
@@ -388,7 +389,7 @@ function profile_photo_content(&$a) {
 	}
 
 	return; // NOTREACHED
-}}
+}
 
 /* @brief Generate the UI for photo-cropping
  *
@@ -399,8 +400,8 @@ function profile_photo_content(&$a) {
  */
 
 
-if(! function_exists('profile_photo_crop_ui_head')) {
-function profile_photo_crop_ui_head(&$a, $ph){
+
+function profile_photo_crop_ui_head(&$a, $ph, $hash, $smallest){
 
 	$max_length = get_config('system','max_image_length');
 	if(! $max_length)
@@ -417,34 +418,10 @@ function profile_photo_crop_ui_head(&$a, $ph){
 		$height = $ph->getHeight();
 	}
 
-	$hash = photo_new_resource();
-	$smallest = 0;
-
-	$p = array('aid' => get_account_id(), 'uid' => local_channel(), 'resource_id' => $hash,
-		'filename' => $filename, 'album' => t('Profile Photos'), 'scale' => 0);
-	$r = $ph->save($p);
-
-	if($r)
-		info( t('Image uploaded successfully.') . EOL );
-	else
-		notice( t('Image upload failed.') . EOL );
-
-	if($width > 640 || $height > 640) {
-		$ph->scaleImage(640);
-		$p['scale'] = 1;
-
-		$r = $ph->save($p);
-
-		if($r === false)
-			notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );
-		else
-			$smallest = 1;
-	}
 
 	$a->data['imagecrop'] = $hash;
 	$a->data['imagecrop_resolution'] = $smallest;
-	$a->data['imagecrop_ext'] = $ph->getExt();
 	$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), array());
 	return;
-}}
+}