From 52374bcd6e5726828219bed7a8c04f5456b167d5 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Mar 2015 15:33:08 -0700 Subject: phase one of the great file storage unification - use one button for uploads of any type (image or attachment). We'll sort out which one it is and deal with it appropriately. --- mod/wall_attach.php | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) (limited to 'mod/wall_attach.php') diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 47c097416..465c3e1cc 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -2,15 +2,42 @@ require_once('include/attach.php'); require_once('include/identity.php'); +require_once('include/photos.php'); function wall_attach_post(&$a) { if(argc() > 1) $channel = get_channel_by_nick(argv(1)); - else + elseif($_FILES['media']) { + require_once('include/api.php'); + $user_info = api_get_user($a); + $nick = $user_info['screen_name']; + $channel = get_channel_by_nick($user_info['screen_name']); + } + + if(! $channel) killme(); - $r = attach_store($channel,get_observer_hash()); + $observer = $a->get_observer(); + + + if($_FILES['userfile']['tmp_name']) { + $x = getimagesize($_FILES['userfile']['tmp_name']); + if(($x) && ($x[2] === IMG_GIF || $x[2] === IMG_JPG || $x[2] === IMG_JPEG || $x[2] === IMG_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(! $r['success']) { notice( $r['message'] . EOL); -- cgit v1.2.3 From ccf4734f7bb525ae6b1ebe63e3a2b6b00c4f823b Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 16 Mar 2015 15:50:45 -0700 Subject: make sure this sucker is quiet --- mod/wall_attach.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/wall_attach.php') diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 465c3e1cc..498389986 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -22,7 +22,7 @@ function wall_attach_post(&$a) { if($_FILES['userfile']['tmp_name']) { - $x = getimagesize($_FILES['userfile']['tmp_name']); + $x = @getimagesize($_FILES['userfile']['tmp_name']); if(($x) && ($x[2] === IMG_GIF || $x[2] === IMG_JPG || $x[2] === IMG_JPEG || $x[2] === IMG_PNG)) { $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash'])); $ret = photo_upload($channel,$observer,$args); -- cgit v1.2.3 From 0883512e30af10ea7ed0f461afc8236a828e7d2b Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 18 Apr 2015 17:40:44 -0700 Subject: log this since we may need it to track down failures --- mod/wall_attach.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/wall_attach.php') diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 498389986..021f9f999 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -23,6 +23,7 @@ function wall_attach_post(&$a) { if($_FILES['userfile']['tmp_name']) { $x = @getimagesize($_FILES['userfile']['tmp_name']); + logger('getimagesize: ' . print_r($x,true), LOGGER_DATA); if(($x) && ($x[2] === IMG_GIF || $x[2] === IMG_JPG || $x[2] === IMG_JPEG || $x[2] === IMG_PNG)) { $args = array( 'source' => 'editor', 'visible' => 0, 'contact_allow' => array($channel['channel_hash'])); $ret = photo_upload($channel,$observer,$args); -- cgit v1.2.3 From dadcfd3ff675bfa0d0098ef34fe6a9aece3d096b Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 19 Apr 2015 18:06:24 -0400 Subject: switch from IMG_XXX constants to IMAGETYPE_XXX constants --- mod/wall_attach.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/wall_attach.php') diff --git a/mod/wall_attach.php b/mod/wall_attach.php index 021f9f999..4b7103802 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -24,7 +24,7 @@ function wall_attach_post(&$a) { if($_FILES['userfile']['tmp_name']) { $x = @getimagesize($_FILES['userfile']['tmp_name']); logger('getimagesize: ' . print_r($x,true), LOGGER_DATA); - if(($x) && ($x[2] === IMG_GIF || $x[2] === IMG_JPG || $x[2] === IMG_JPEG || $x[2] === IMG_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'])); $ret = photo_upload($channel,$observer,$args); if($ret['success']) { -- cgit v1.2.3