convert wall_upload to use the photo api

4 files changed, 39 insertions, 136 deletions

diff --git a/include/photos.php b/include/photos.php
index c6e54517a..d4ddb8909 100644
--- a/include/photos.php
+++ b/include/photos.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/permissions.php');
+require_once('include/items.php');
 
 function photo_upload($channel, $observer, $args) {
 
@@ -184,7 +185,7 @@ function photo_upload($channel, $observer, $args) {
 	// Create item container
 
 	$item_flags = ITEM_WALL|ITEM_ORIGIN|ITEM_THREAD_TOP;
-	$item_restrict = (($visibility) ? ITEM_HIDDEN : ITEM_VISIBLE);			
+	$item_restrict = (($visible) ? ITEM_VISIBLE : ITEM_HIDDEN);			
 	$title = '';
 	$uri = item_message_id();
 			
@@ -217,6 +218,7 @@ function photo_upload($channel, $observer, $args) {
 		proc_run('php', "include/notifier.php", 'wall-new', $item_id);
 
 	$ret['success'] = true;
+	$ret['body'] = $arr['body'];
 	$ret['photoitem_id'] = $item_id;
 
 	call_hooks('photo_post_end',$ret);
diff --git a/mod/item.php b/mod/item.php
index 080413be9..4bfb34e41 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1006,6 +1006,27 @@ function fix_attached_photo_permissions($uid,$xchan_hash,$body,
 						intval($uid),
 						dbesc( t('Wall Photos'))
 					);
+
+					// also update the linked item (which is probably invisible)
+
+					$r = q("select id from item
+						WHERE allow_cid = '%s' AND allow_gid = '' AND deny_cid = '' AND deny_gid = ''
+						AND resource_id = '%s' and resource_type = 'photo' AND uid = %d LIMIT 1",
+						dbesc($srch),
+						dbesc($image_uri),
+						intval($uid)
+					);
+					if($r) {
+						$r = q("UPDATE item SET allow_cid = '%s', allow_gid = '%s', deny_cid = '%s', deny_gid = '%s'
+							WHERE id = %d AND uid = %d limit 1",
+							dbesc($str_contact_allow),
+							dbesc($str_group_allow),
+							dbesc($str_contact_deny),
+							dbesc($str_group_deny),
+							intval($r[0]['id']),
+							intval($uid)
+						);
+					}
 				}
 			}
 		}
diff --git a/mod/photos.php b/mod/photos.php
index e74ced67c..90b2990aa 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -525,6 +525,7 @@ function photos_post(&$a) {
 	 * default post action - upload a photo
 	 */
 
+	$_REQUEST['source'] = 'photos';
 
 	$r = photo_upload($a->channel,$a->get_observer(), $_REQUEST);
 	if(! $r['success']) {
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index b249dec4e..cee40744f 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,7 +1,7 @@
 <?php
 
 require_once('Photo.php');
-
+require_once('include/photos.php');
 
 
 
@@ -32,150 +32,29 @@ function wall_upload_post(&$a) {
 	if(! $channel) {
 		if($using_api)
 			return;
-		else {
-			notice( t('Channel not found.') . EOL);
-			killme();
-		}
+		notice( t('Channel not found.') . EOL);
+		killme();
 	}
 
-	$can_post  = false;
-	$visitor   = 0;
-
-
-	$page_owner_uid   = $r[0]['channel_id'];
-
 	$observer = $a->get_observer();
 
-	if(! perm_is_allowed($page_owner_uid,$observer['xchan_hash'],'post_photos')) {
-		if($using_api)
-			return;
-		else {
-			notice( t('Permission denied.') . EOL);
-			killme();
-		}
-	}
-
-	if(x($_FILES,'userfile')) {
-		$src      = $_FILES['userfile']['tmp_name'];
-		$filename = basename($_FILES['userfile']['name']);
-		$filesize = intval($_FILES['userfile']['size']);
-		$filetype = $_FILES['userfile']['type'];
-	}
-	elseif(x($_FILES,'media')) {
-		$src = $_FILES['media']['tmp_name'];
-		$filename = basename($_FILES['media']['name']);
-		$filesize = intval($_FILES['media']['size']);
-		$filetype = $_FILES['media']['type'];
-	}
-	else {
-		if($using_api)
-			return;
-		else {
-			notice( t('Empty upload.') . EOL);
-			killme();
-		}
-	}
-
-	
-    if($filetype == "") 
-		$filetype=guess_image_type($filename);
-	$maximagesize = get_config('system','maximagesize');
-
-	if(($maximagesize) && ($filesize > $maximagesize)) {
-		@unlink($src);
-		if($using_api)
-			return;
-		else {
-			echo  sprintf( t('Image exceeds size limit of %d'), $maximagesize) . EOL;
-			killme();
-		}
-	}
-
-
-	$limit = service_class_fetch($page_owner_uid,'photo_upload_limit');
-	if($limit !== false) {
-		$r = q("select sum(size) as total from photo where uid = %d and scale = 0 ",
-			intval($page_owner_uid)
-		);
-		if(($r) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
-			@unlink($src);
-			if($using_api)
-				return;
-			else {
-				echo upgrade_message(true) . EOL ;
-				killme();
-			}
-		}
-	}
+	$args = array( 'source' => 'editor', 'album' => t('Wall Photos'), 
+			'not_visible' => 1, 'contact_allow' => array($channel['channel_hash']));
 
-	$imagedata = @file_get_contents($src);
-	$ph = new Photo($imagedata, $filetype);
+ 	$ret = photo_upload($channel,$observer,$args);
 
-	if(! $ph->is_valid()) {
-		@unlink($src);
+	if(! $ret['success']) {
 		if($using_api)
 			return;
-		else {
-			echo ( t('Unable to process image.') . EOL);
-			killme();
-		}
+		notice($ret['message']);
+		killme();
 	}
 
-	$ph->orient($src);
-	@unlink($src);
-
-	$max_length = get_config('system','max_image_length');
-	if(! $max_length)
-		$max_length = MAX_IMAGE_LENGTH;
-	if($max_length > 0)
-		$ph->scaleImage($max_length);
-
-	$width = $ph->getWidth();
-	$height = $ph->getHeight();
-
-	$hash = photo_new_resource();
-	
-	$smallest = 0;
-
-	$defperm = '<' . $channel['channel_hash'] . '>';
-	$aid = $channel['channel_account_id'];
-	$visitor = ((remote_user()) ? remote_user() : '');
-
-	$r = $ph->store($aid, $page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 0, 0, $defperm);
-
-	if(! $r) {
-		if($using_api)
-			return;
-		else {
-			echo ( t('Image upload failed.') . EOL);
-			killme();
-		}
-	}
-
-	if($width > 640 || $height > 640) {
-		$ph->scaleImage(640);
-		$r = $ph->store($aid, $page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 1, 0, $defperm);
-		if($r) 
-			$smallest = 1;
-	}
-
-	if($width > 320 || $height > 320) {
-		$ph->scaleImage(320);
-		$r = $ph->store($aid, $page_owner_uid, $visitor, $hash, $filename, t('Wall Photos'), 2, 0, $defperm);
-		if($r)
-			$smallest = 2;
-	}
-
-	$basename = basename($filename);
-
-	if($_REQUEST['silent']) {
-		$m = '[url=' . $a->get_baseurl() . '/photos/' . $channel['channel_address'] . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]";
-		return($m);
-	}
-	else {
-		echo  "\n\n" . '[url=' . $a->get_baseurl() . '/photos/' . $channel['channel_address'] . '/image/' . $hash . '][img]' . $a->get_baseurl() . "/photo/{$hash}-{$smallest}.".$ph->getExt()."[/img][/url]\n\n";
-	}
+	$m = $ret['body'];
 
+	if($using_api)
+		return($ret['body']);
+	else
+		echo  "\n\n" . $ret['body'] . "\n\n";
 	killme();
-	// NOTREACHED
 }