aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
diff options
context:
space:
mode:
authorMax Kostikov <max@kostikov.co>2019-08-10 11:23:51 +0200
committerMax Kostikov <max@kostikov.co>2019-08-10 11:23:51 +0200
commit047dd31724f8da12c153b4a6f27dc5462f7b97e5 (patch)
tree78ba9004d87b994dd9a531b475fd51b940bf3dd8 /Zotlabs/Module
parent4886d088e9889d828bc0e43de4f8844f210f785d (diff)
parent0ce1a200f70c831aee2d2af3329133ef654f6b77 (diff)
downloadvolse-hubzilla-047dd31724f8da12c153b4a6f27dc5462f7b97e5.tar.gz
volse-hubzilla-047dd31724f8da12c153b4a6f27dc5462f7b97e5.tar.bz2
volse-hubzilla-047dd31724f8da12c153b4a6f27dc5462f7b97e5.zip
Merge branch 'dev' into 'dev'
Improve plink to share tag detection See merge request hubzilla/core!1704
Diffstat (limited to 'Zotlabs/Module')
-rw-r--r--Zotlabs/Module/Linkinfo.php26
1 files changed, 14 insertions, 12 deletions
diff --git a/Zotlabs/Module/Linkinfo.php b/Zotlabs/Module/Linkinfo.php
index 7d6ff4043..fcf8a6aa1 100644
--- a/Zotlabs/Module/Linkinfo.php
+++ b/Zotlabs/Module/Linkinfo.php
@@ -46,18 +46,20 @@ class Linkinfo extends \Zotlabs\Web\Controller {
logger('linkinfo: ' . $url);
- // Replace plink URL with 'share' tag if possible
- if (preg_match("/mid=b64\.(\w+)(&.+)?$/", $url, $mid)) {
-
- $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
- dbesc(base64url_decode($mid[1])),
- intval(local_channel())
- );
- if ($r) {
- echo "[share=" . $r[0]['id'] . "][/share]";
- killme();
- }
- }
+ // Replace plink URL with 'share' tag if possible
+ preg_match("/(mid=b64\.|display\/|posts\/)([\w\-]+)(&.+)?$/", $url, $mid);
+
+ if (!empty($mid) && $mid[1] == 'mid=b64.')
+ $mid[2] = base64_decode($mid[2]);
+
+ $r = q("SELECT id FROM item WHERE mid = '%s' AND uid = %d LIMIT 1",
+ dbesc((empty($mid) ? $url : $mid[2])),
+ intval(local_channel())
+ );
+ if ($r) {
+ echo "[share=" . $r[0]['id'] . "][/share]";
+ killme();
+ }
$result = z_fetch_url($url,false,0,array('novalidate' => true, 'nobody' => true));
if($result['success']) {