diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-03 20:33:34 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-03 20:33:34 -0800 |
| commit | c598bbb8a94e2acd30f9f1a121dfcc2bffe6ee3d (patch) | |
| tree | 98697eb2987f741fd98797463036e7ef660c2721 /mod/oep.php | |
| parent | 006efbd906980fca8c0c377fa2b0a4054c2849f4 (diff) | |
| parent | e6f388d8694b3f33d2039a525a855775487ca77c (diff) | |
| download | volse-hubzilla-c598bbb8a94e2acd30f9f1a121dfcc2bffe6ee3d.tar.gz volse-hubzilla-c598bbb8a94e2acd30f9f1a121dfcc2bffe6ee3d.tar.bz2 volse-hubzilla-c598bbb8a94e2acd30f9f1a121dfcc2bffe6ee3d.zip | |
Merge branch 'embedsec'
Diffstat (limited to 'mod/oep.php')
| -rw-r--r-- | mod/oep.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/mod/oep.php b/mod/oep.php index 3855a1b4a..42535c069 100644 --- a/mod/oep.php +++ b/mod/oep.php @@ -8,6 +8,7 @@ function oep_init(&$a) { logger('oep: ' . print_r($_REQUEST,true), LOGGER_DEBUG, LOG_INFO); + $html = ((argc() > 1 && argv(1) === 'html') ? true : false); if($_REQUEST['url']) { $_REQUEST['url'] = strip_zids($_REQUEST['url']); $url = $_REQUEST['url']; @@ -38,8 +39,16 @@ function oep_init(&$a) { $arr = oep_profile_reply($_REQUEST); if($arr) { - header('Content-Type: application/json+oembed'); - echo json_encode($arr); + if($html) { + if($arr['type'] === 'rich') { + header('Content-Type: text/html'); + echo $arr['html']; + } + } + else { + header('Content-Type: application/json+oembed'); + echo json_encode($arr); + } killme(); } |