1 files changed, 40 insertions, 24 deletions

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index ea7a01bc9..876e3a931 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once("Photo.php");
+require_once('include/photo/photo_driver.php');
 
 function profile_photo_init(&$a) {
 
@@ -14,16 +14,6 @@ function profile_photo_init(&$a) {
 }
 
 
-function profile_photo_aside(&$a) {
-
-	if(! local_user()) {
-		return;
-	}
-
-	profile_create_sidebar($a);
-}
-
-
 function profile_photo_post(&$a) {
 
 	if(! local_user()) {
@@ -42,7 +32,7 @@ function profile_photo_post(&$a) {
 				intval($_REQUEST['profile']),
 				intval(local_user())
 			);
-			if(count($r) && (! intval($r[0]['is_default'])))
+			if(($r) && (! intval($r[0]['is_default'])))
 				$is_default_profile = 0;
 		} 
 
@@ -77,25 +67,30 @@ function profile_photo_post(&$a) {
 
 			$base_image = $r[0];
 		
-			$im = new Photo($base_image['data'], $base_image['type']);
+			$im = photo_factory($base_image['data'], $base_image['type']);
 			if($im->is_valid()) {
 
 				$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
 				$aid = get_account_id();
 
-				$r1 = $im->store($aid, local_user(), '', $base_image['resource_id'],$base_image['filename'], 
-					t('Profile Photos'), 4, $is_default_profile);
+				$p = array('aid' => $aid, 'uid' => local_user(), 'resource_id' => $base_image['resource_id'],
+					'filename' => $base_image['filename'], 'album' => t('Profile Photos'));
+
+				$p['scale'] = 4;
+				$p['photo_flags'] = (($is_default_profile) ? PHOTO_PROFILE : PHOTO_NORMAL);
+
+				$r1 = $im->save($p);
 
 				$im->scaleImage(80);
+				$p['scale'] = 5;
 
-				$r2 = $im->store($aid, local_user(), '', $base_image['resource_id'],$base_image['filename'], 
-					t('Profile Photos'), 5, $is_default_profile);
+				$r2 = $im->save($p);
 			
 				$im->scaleImage(48);
+				$p['scale'] = 6;
 
-				$r3 = $im->store($aid, local_user(), '', $base_image['resource_id'],$base_image['filename'], 
-					t('Profile Photos'), 6, $is_default_profile);
+				$r3 = $im->save($p);
 			
 				if($r1 === false || $r2 === false || $r3 === false) {
 					// if one failed, delete them all so we can start over.
@@ -114,6 +109,13 @@ function profile_photo_post(&$a) {
 						dbesc($base_image['resource_id']),
 						intval(local_user())
 					);
+					$r = q("UPDATE photo SET photo_flags = ( photo_flags ^ %d ) WHERE ( photo_flags & %d ) 
+						AND resource_id != '%s' AND `uid` = %d",
+						intval(PHOTO_PROFILE),
+						intval(PHOTO_PROFILE),
+						dbesc($base_image['resource_id']),
+						intval(local_user())
+					);
 				}
 				else {
 					$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d limit 1",
@@ -164,7 +166,7 @@ function profile_photo_post(&$a) {
 	}
 
 	$imagedata = @file_get_contents($src);
-	$ph = new Photo($imagedata, $filetype);
+	$ph = photo_factory($imagedata, $filetype);
 
 	if(! $ph->is_valid()) {
 		notice( t('Unable to process image.') . EOL );
@@ -224,6 +226,10 @@ function profile_photo_content(&$a) {
 			// unset any existing profile photos
 			$r = q("UPDATE photo SET profile = 0 WHERE profile = 1 AND uid = %d",
 				intval(local_user()));
+			$r = q("UPDATE photo SET photo_flags = (photo_flags ^ %d ) WHERE (photo_flags & %d ) AND uid = %d",
+				intval(PHOTO_PROFILE),
+				intval(PHOTO_PROFILE),
+				intval(local_user()));
 			
 			// set all sizes of this one as profile photos
 			$r = q("UPDATE photo SET profile = 1 WHERE uid = %d AND resource_id = '%s'",
@@ -231,6 +237,12 @@ function profile_photo_content(&$a) {
 				dbesc($resource_id)
 				);
 
+			$r = q("UPDATE photo SET photo_flags = ( photo_flags | %d ) WHERE uid = %d AND resource_id = '%s'",
+				intval(PHOTO_PROFILE),
+				intval(local_user()),
+				dbesc($resource_id)
+				);
+
 			$r = q("UPDATE xchan set xchan_photo_date = '%s' 
 				where xchan_hash = '%s' limit 1",
 				dbesc(datetime_convert()),
@@ -241,7 +253,7 @@ function profile_photo_content(&$a) {
 			goaway($a->get_baseurl() . '/profiles');
 		}
 
-		$r = q("SELECT data, type FROM photo WHERE id = %d and uid = %d limit 1",
+		$r = q("SELECT `data`, `type` FROM photo WHERE id = %d and uid = %d limit 1",
 			intval($r[0]['id']),
 			intval(local_user())
 
@@ -251,7 +263,7 @@ function profile_photo_content(&$a) {
 			return;
 		}
 
-		$ph = new Photo($r[0]['data'], $r[0]['type']);
+		$ph = photo_factory($r[0]['data'], $r[0]['type']);
 		// go ahead as if we have just uploaded a new photo to crop
 		profile_photo_crop_ui_head($a, $ph);
 	}
@@ -320,7 +332,9 @@ function profile_photo_crop_ui_head(&$a, $ph){
 	$hash = photo_new_resource();
 	$smallest = 0;
 
-	$r = $ph->store(get_account_id(), local_user(), '', $hash, $filename, t('Profile Photos'), 0 );	
+	$p = array('aid' => get_account_id(), 'uid' => local_user(), 'resource_id' => $hash,
+		'filename' => $filename, 'album' => t('Profile Photos'), 'scale' => 0);
+	$r = $ph->save($p);
 
 	if($r)
 		info( t('Image uploaded successfully.') . EOL );
@@ -329,7 +343,9 @@ function profile_photo_crop_ui_head(&$a, $ph){
 
 	if($width > 640 || $height > 640) {
 		$ph->scaleImage(640);
-		$r = $ph->store(get_account_id(), local_user(), '' , $hash, $filename, t('Profile Photos'), 1 );	
+		$p['scale'] = 1;
+
+		$r = $ph->save($p);
 		
 		if($r === false)
 			notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );