From 9642728e7d72ca50c0919bc671866f6dfd29cff1 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Sun, 14 Jun 2015 16:50:24 -0700
Subject: first cut at merging files and photos, not yet well integrated but
 they are integrated

---
 include/attach.php | 14 ++++++++++----
 include/expire.php |  1 -
 2 files changed, 10 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/attach.php b/include/attach.php
index a445826b0..5e8dd592e 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -345,6 +345,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	$ret = array('success' => false);
 	$channel_id = $channel['channel_id'];
 	$sql_options = '';
+	$source = (($arr) ? $arr['source'] : '');
 
 	if(! perm_is_allowed($channel_id,get_observer_hash(), 'write_storage')) {
 		$ret['message'] = t('Permission denied.');
@@ -439,10 +440,6 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 	}
 
 
-
-
-
-
 	$created = datetime_convert();
 
 	if($options === 'replace') {
@@ -519,6 +516,14 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		);
 	}
 
+	if($is_photo) {
+		$args = array( 'source' => $source, 'visible' => 0, 'contact_allow' => array($channel['channel_hash']), 'data' => @file_get_contents($src));
+		$p = photo_upload($channel,get_app()->get_observer(),$args);
+		if($p['success']) {
+			$ret['body'] = $p['body'];
+		}
+	}
+
 	if($options !== 'update')
 		@unlink($src);
 
@@ -539,6 +544,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
 		return $ret;
 	}
 
+
 	$ret['success'] = true;
 	$ret['data'] = $r[0];
 
diff --git a/include/expire.php b/include/expire.php
index 1af13163d..47cc04829 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -13,7 +13,6 @@ function expire_run($argv, $argc){
 	// perform final cleanup on previously delete items
 
 	$r = q("select id from item where item_deleted = 1 and item_pending_remove = 0 and changed < %s - INTERVAL %s",
-		intval(ITEM_PENDING_REMOVE),
 		db_utcnow(), db_quoteinterval('10 DAY')
 	);
 	if ($r) {
-- 
cgit v1.2.3