diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-14 16:50:24 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-14 16:50:24 -0700 |
| commit | 9642728e7d72ca50c0919bc671866f6dfd29cff1 (patch) | |
| tree | 10f47877ae906ebaf6b418b785d889b429290ee2 /mod/wall_attach.php | |
| parent | 23f7f60bf7b15ca5332803ca1e24280489042b7a (diff) | |
| download | volse-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
Diffstat (limited to 'mod/wall_attach.php')
| -rw-r--r-- | mod/wall_attach.php | 44 |
1 files changed, 25 insertions, 19 deletions
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(); } |