bring the new photo schema into play

2 files changed, 19 insertions, 27 deletions

diff --git a/mod/photos.php b/mod/photos.php
index 7cbb798a8..90e76674b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -578,11 +578,12 @@ function photos_content(&$a) {
 		$album = hex2bin($datum);
 
 		$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' 
-			AND `scale` <= 4 and ((photo_flags = %d) or (photo_flags & %d ) > 0) $sql_extra GROUP BY `resource_id`",
+			AND `scale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
 			intval($owner_uid),
 			dbesc($album),
 			intval(PHOTO_NORMAL),
-			intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE)
+			intval(PHOTO_PROFILE),
+			intval($unsafe)
 		);
 		if(count($r)) {
 			$a->set_pager_total(count($r));
@@ -598,13 +599,14 @@ function photos_content(&$a) {
 
 			
 		$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.scale, p.description, p.created FROM photo p INNER JOIN
-				(SELECT resource_id, max(scale) scale FROM photo WHERE uid = %d AND album = '%s' AND scale <= 4 AND (photo_flags = %d or photo_flags = %d ) $sql_extra GROUP BY resource_id) ph 
+				(SELECT resource_id, max(scale) scale FROM photo WHERE uid = %d AND album = '%s' AND scale <= 4 AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY resource_id) ph 
 				ON (p.resource_id = ph.resource_id AND p.scale = ph.scale)
 			ORDER BY created $order LIMIT %d OFFSET %d",
 			intval($owner_uid),
 			dbesc($album),
-			intvaL(PHOTO_NORMAL),
-			intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE),
+			intval(PHOTO_NORMAL),
+			intval(PHOTO_PROFILE),
+			intval($unsafe),
 			intval($a->pager['itemspage']),
 			intval($a->pager['start'])
 		);
@@ -1140,12 +1142,13 @@ function photos_content(&$a) {
 	//$o = '';
 
 	$r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' 
-		and ((photo_flags = %d) or (photo_flags & %d) > 0) $sql_extra GROUP BY `resource_id`",
+		and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`",
 		intval($a->data['channel']['channel_id']),
 		dbesc('Contact Photos'),
 		dbesc( t('Contact Photos')),
 		intval(PHOTO_NORMAL),
-		intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE)
+		intval(PHOTO_PROFILE),
+		intval($unsafe)
 	);
 	if(count($r)) {
 		$a->set_pager_total(count($r));
@@ -1155,13 +1158,14 @@ function photos_content(&$a) {
 	$r = q("SELECT p.resource_id, p.id, p.filename, p.type, p.album, p.scale, p.created FROM photo p INNER JOIN 
 		(SELECT resource_id, max(scale) scale FROM photo 
 			WHERE uid=%d AND album != '%s' AND album != '%s' 
-			AND (photo_flags = %d or ( photo_flags & %d ) > 0 ) $sql_extra group by resource_id) ph 
+			AND photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra group by resource_id) ph 
 		ON (p.resource_id = ph.resource_id and p.scale = ph.scale) ORDER by p.created DESC LIMIT %d OFFSET %d",
 		intval($a->data['channel']['channel_id']),
 		dbesc('Contact Photos'),
 		dbesc( t('Contact Photos')),
 		intval(PHOTO_NORMAL),
-		intval(($unsafe) ? (PHOTO_PROFILE|PHOTO_ADULT) : PHOTO_PROFILE),
+		intval(PHOTO_PROFILE),
+		intval($unsafe),
 		intval($a->pager['itemspage']),
 		intval($a->pager['start'])
 	);
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index fd5ea2af2..9fe042500 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())
@@ -301,20 +297,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)