diff options
author | friendica <info@friendica.com> | 2012-04-22 16:25:02 -0700 |
---|---|---|
committer | friendica <info@friendica.com> | 2012-04-22 16:25:02 -0700 |
commit | 724e1d15d0441fa169598397416d1e470e539d02 (patch) | |
tree | ea3df9b38646ed1d6343426b84cf50a8a3e3004c /mod | |
parent | 00cb7f9efb4826a6ad5c0791f26bc5e8db644f77 (diff) | |
parent | c0dffa7442abdcaee8bcc2eb97a3ed71d60ce554 (diff) | |
download | volse-hubzilla-724e1d15d0441fa169598397416d1e470e539d02.tar.gz volse-hubzilla-724e1d15d0441fa169598397416d1e470e539d02.tar.bz2 volse-hubzilla-724e1d15d0441fa169598397416d1e470e539d02.zip |
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'mod')
-rw-r--r-- | mod/ping.php | 2 | ||||
-rw-r--r-- | mod/wall_upload.php | 38 |
2 files changed, 28 insertions, 12 deletions
diff --git a/mod/ping.php b/mod/ping.php index e911aaf1f..63aaa0f45 100644 --- a/mod/ping.php +++ b/mod/ping.php @@ -134,6 +134,8 @@ function ping_init(&$a) { function xmlize($href, $name, $url, $photo, $date, $seen, $message){ + $data = array('href' => &$href, 'name' => &$name, 'url'=>&$url, 'photo'=>&$photo, 'date'=>&$date, 'seen'=>&$seen, 'messsage'=>&$message); + call_hooks('ping_xmlize', $data); $notsxml = '<note href="%s" name="%s" url="%s" photo="%s" date="%s" seen="%s" >%s</note>'; return sprintf ( $notsxml, xmlify($href), xmlify($name), xmlify($url), xmlify($photo), xmlify($date), xmlify($seen), xmlify($message) diff --git a/mod/wall_upload.php b/mod/wall_upload.php index f341cc9cd..fa66561e8 100644 --- a/mod/wall_upload.php +++ b/mod/wall_upload.php @@ -5,19 +5,26 @@ require_once('Photo.php'); function wall_upload_post(&$a) { if($a->argc > 1) { - $nick = $a->argv[1]; - $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1", - dbesc($nick) - ); - if(! count($r)) - return; - + if(! x($_FILES,'media')) { + $nick = $a->argv[1]; + $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1", + dbesc($nick) + ); + + if(! count($r)) + return; + } + else { + $user_info = api_get_user($a); + $r = q("SELECT `user`.*, `contact`.`id` FROM `user` LEFT JOIN `contact` on `user`.`uid` = `contact`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 and `contact`.`self` = 1 LIMIT 1", + dbesc($user_info['screen_name']) + ); + } } else return; - $can_post = false; $visitor = 0; @@ -47,12 +54,19 @@ function wall_upload_post(&$a) { killme(); } - if(! x($_FILES,'userfile')) + if(! x($_FILES,'userfile') && ! x($_FILES,'media')) killme(); - $src = $_FILES['userfile']['tmp_name']; - $filename = basename($_FILES['userfile']['name']); - $filesize = intval($_FILES['userfile']['size']); + if(x($_FILES,'userfile')) { + $src = $_FILES['userfile']['tmp_name']; + $filename = basename($_FILES['userfile']['name']); + $filesize = intval($_FILES['userfile']['size']); + } + elseif(x($_FILES,'media')) { + $src = $_FILES['media']['tmp_name']; + $filename = basename($_FILES['media']['name']); + $filesize = intval($_FILES['media']['size']); + } $maximagesize = get_config('system','maximagesize'); |