harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first cut at merging files and photos, not yet well integrated but they are integrated

Browse Source
This commit is contained in:
redmatrix 2015-06-14 16:50:24 -07:00
parent 23f7f60bf7
commit 9642728e7d
3 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/attach.php
View File

@ -345,6 +345,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
$ret = array('success' => false); $ret = array('success' => false);
$channel_id = $channel['channel_id']; $channel_id = $channel['channel_id'];
$sql_options = ''; $sql_options = '';
$source = (($arr) ? $arr['source'] : '');
if(! perm_is_allowed($channel_id,get_observer_hash(), 'write_storage')) { if(! perm_is_allowed($channel_id,get_observer_hash(), 'write_storage')) {
$ret['message'] = t('Permission denied.'); $ret['message'] = t('Permission denied.');
@ -439,10 +440,6 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
} }
$created = datetime_convert(); $created = datetime_convert();
if($options === 'replace') { 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') if($options !== 'update')
@unlink($src); @unlink($src);
@ -539,6 +544,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) {
return $ret; return $ret;
} }
$ret['success'] = true; $ret['success'] = true;
$ret['data'] = $r[0]; $ret['data'] = $r[0];

1
include/expire.php
View File

@ -13,7 +13,6 @@ function expire_run($argv, $argc){
// perform final cleanup on previously delete items // 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", $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') db_utcnow(), db_quoteinterval('10 DAY')
); );
if ($r) { if ($r) {

42
mod/wall_attach.php
View File

@ -21,31 +21,37 @@ function wall_attach_post(&$a) {
$observer = $a->get_observer(); $observer = $a->get_observer();
if($_FILES['userfile']['tmp_name']) { // if($_FILES['userfile']['tmp_name']) {
$x = @getimagesize($_FILES['userfile']['tmp_name']); // $x = @getimagesize($_FILES['userfile']['tmp_name']);
logger('getimagesize: ' . print_r($x,true), LOGGER_DATA); // logger('getimagesize: ' . print_r($x,true), LOGGER_DATA);
if(($x) && ($x[2] === IMAGETYPE_GIF || $x[2] === IMAGETYPE_JPEG || $x[2] === IMAGETYPE_PNG)) { // 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'])); // $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash']));
$ret = photo_upload($channel,$observer,$args); // $ret = photo_upload($channel,$observer,$args);
if($ret['success']) { // if($ret['success']) {
echo "\n\n" . $ret['body'] . "\n\n"; // echo "\n\n" . $ret['body'] . "\n\n";
killme(); // killme();
} // }
if($using_api) // if($using_api)
return; // return;
notice($ret['message']); // notice($ret['message']);
killme(); // killme();
} // }
} // }
$r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : '')); $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),array('source' => 'editor'));
if(! $r['success']) { if(! $r['success']) {
notice( $r['message'] . EOL); notice( $r['message'] . EOL);
killme(); 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(); killme();
} }