aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-06-14 16:50:24 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-06-14 16:50:24 -0700
commit9642728e7d72ca50c0919bc671866f6dfd29cff1 (patch)
tree10f47877ae906ebaf6b418b785d889b429290ee2
parent23f7f60bf7b15ca5332803ca1e24280489042b7a (diff)
downloadvolse-hubzilla-9642728e7d72ca50c0919bc671866f6dfd29cff1.tar.gz
volse-hubzilla-9642728e7d72ca50c0919bc671866f6dfd29cff1.tar.bz2
volse-hubzilla-9642728e7d72ca50c0919bc671866f6dfd29cff1.zip
first cut at merging files and photos, not yet well integrated but they are integrated
-rw-r--r--include/attach.php14
-rw-r--r--include/expire.php1
-rw-r--r--mod/wall_attach.php44
3 files changed, 35 insertions, 24 deletions
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) {
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 4b7103802..c3c0bff03 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -21,31 +21,37 @@ function wall_attach_post(&$a) {
$observer = $a->get_observer();
- if($_FILES['userfile']['tmp_name']) {
- $x = @getimagesize($_FILES['userfile']['tmp_name']);
- logger('getimagesize: ' . print_r($x,true), LOGGER_DATA);
- if(($x) && ($x[2] === IMAGETYPE_GIF || $x[2] === IMAGETYPE_JPEG || $x[2] === IMAGETYPE_PNG)) {
- $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
- $ret = photo_upload($channel,$observer,$args);
- if($ret['success']) {
- echo "\n\n" . $ret['body'] . "\n\n";
- killme();
- }
- if($using_api)
- return;
- notice($ret['message']);
- killme();
- }
- }
-
- $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''));
+// if($_FILES['userfile']['tmp_name']) {
+// $x = @getimagesize($_FILES['userfile']['tmp_name']);
+// logger('getimagesize: ' . print_r($x,true), LOGGER_DATA);
+// if(($x) && ($x[2] === IMAGETYPE_GIF || $x[2] === IMAGETYPE_JPEG || $x[2] === IMAGETYPE_PNG)) {
+// $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
+// $ret = photo_upload($channel,$observer,$args);
+// if($ret['success']) {
+// echo "\n\n" . $ret['body'] . "\n\n";
+// killme();
+// }
+// if($using_api)
+// return;
+// notice($ret['message']);
+// killme();
+// }
+// }
+
+ $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),array('source' => 'editor'));
if(! $r['success']) {
notice( $r['message'] . EOL);
killme();
}
- echo "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
+ if(intval($r['data']['is_photo'])) {
+ echo "\n\n" . $r['body'] . "\n\n";
+ if($using_api)
+ return;
+ }
+ else
+ echo "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n";
killme();
}