diff options
| author | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
|---|---|---|
| committer | Paolo Tacconi <p.tacconi@giunti.it> | 2016-04-15 09:20:58 +0200 |
| commit | 45a854762b451dafb882bc56efce054b64420627 (patch) | |
| tree | 958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /mod/wall_attach.php | |
| parent | 1806da0851dd5cf5978b19d12783ae3101a11257 (diff) | |
| parent | a29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff) | |
| download | volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2 volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip | |
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'mod/wall_attach.php')
| -rw-r--r-- | mod/wall_attach.php | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/mod/wall_attach.php b/mod/wall_attach.php index f52a4f2e5..7f054705f 100644 --- a/mod/wall_attach.php +++ b/mod/wall_attach.php @@ -8,9 +8,9 @@ function wall_attach_post(&$a) { $using_api = false; - if($a->data['api_info'] && array_key_exists('media',$_FILES)) { + if(App::$data['api_info'] && array_key_exists('media',$_FILES)) { $using_api = true; - $user_info = $a->data['api_info']; + $user_info = App::$data['api_info']; $nick = $user_info['screen_name']; $channel = get_channel_by_nick($user_info['screen_name']); } @@ -20,26 +20,9 @@ function wall_attach_post(&$a) { if(! $channel) killme(); - $observer = $a->get_observer(); + $observer = App::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(); -// } -// } - $def_album = get_pconfig($channel['channel_id'],'system','photo_path'); $def_attach = get_pconfig($channel['channel_id'],'system','attach_path'); |