diff options
| author | mrjive <mrjive@mrjive.it> | 2016-02-01 11:25:07 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-02-01 11:25:07 +0100 |
| commit | 337735094b944fd31ed96e36c869227a0d63e5d1 (patch) | |
| tree | 763577a8373b26426dc131c58f6a7f8c9c9213bf /mod/photos.php | |
| parent | 28943af494eae225b256b9771a5699a1b05d7a2f (diff) | |
| parent | 01b5b1347521951ca78b1718b03c45897800bf5e (diff) | |
| download | volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.tar.gz volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.tar.bz2 volse-hubzilla-337735094b944fd31ed96e36c869227a0d63e5d1.zip | |
Merge pull request #20 from redmatrix/master
updating from original codebase
Diffstat (limited to 'mod/photos.php')
| -rw-r--r-- | mod/photos.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mod/photos.php b/mod/photos.php index f1b7aceed..d6105c580 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -660,6 +660,10 @@ function photos_content(&$a) { $album = (($datum) ? hex2bin($datum) : ''); + + $a->page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . $a->cmd) . '" title="oembed" />' . "\r\n"; + + $r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` = '%s' AND `scale` <= 4 and photo_usage IN ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`", intval($owner_uid), @@ -804,6 +808,8 @@ function photos_content(&$a) { if($datatype === 'image') { + $a->page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . $a->cmd) . '" title="oembed" />' . "\r\n"; + // fetch image, item containing image, then comments $ph = q("SELECT id,aid,uid,xchan,resource_id,created,edited,title,`description`,album,filename,`type`,height,width,`size`,scale,photo_usage,is_nsfw,allow_cid,allow_gid,deny_cid,deny_gid FROM `photo` WHERE `uid` = %d AND `resource_id` = '%s' @@ -1226,6 +1232,9 @@ function photos_content(&$a) { // Default - show recent photos with upload link (if applicable) //$o = ''; + $a->page['htmlhead'] .= "\r\n" . '<link rel="alternate" type="application/json+oembed" href="' . z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . $a->cmd) . '" title="oembed" />' . "\r\n"; + + $r = q("SELECT `resource_id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' and photo_usage in ( %d, %d ) and is_nsfw = %d $sql_extra GROUP BY `resource_id`", intval($a->data['channel']['channel_id']), |