diff options
| author | Mario <mario@mariovavti.com> | 2021-10-12 11:25:24 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-10-12 11:25:24 +0000 |
| commit | e455fae334c4b5f8d5a563e099add1482749c92f (patch) | |
| tree | 87a3e2224a4d03b30c97f716a2627f28547c5149 /Zotlabs | |
| parent | 29f3dc2fa351746f50b87cf7b147ab5055b79fa2 (diff) | |
| download | volse-hubzilla-e455fae334c4b5f8d5a563e099add1482749c92f.tar.gz volse-hubzilla-e455fae334c4b5f8d5a563e099add1482749c92f.tar.bz2 volse-hubzilla-e455fae334c4b5f8d5a563e099add1482749c92f.zip | |
httpsig: add parentheses
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Notes.php | 11 | ||||
| -rw-r--r-- | Zotlabs/Web/HTTPSig.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Widget/Notes.php | 1 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Zotlabs/Module/Notes.php b/Zotlabs/Module/Notes.php index 6e8e03f20..57b8f30db 100644 --- a/Zotlabs/Module/Notes.php +++ b/Zotlabs/Module/Notes.php @@ -19,7 +19,12 @@ class Notes extends Controller { if(! Apps::system_app_installed(local_channel(), 'Notes')) return EMPTY_STR; - $ret = array('success' => true); + $ret = [ + 'success' => false, + 'html' => '' + ]; + + if(array_key_exists('note_text',$_REQUEST)) { $body = escape_tags($_REQUEST['note_text']); @@ -33,6 +38,10 @@ class Notes extends Controller { set_pconfig(local_channel(),'notes','text.bak',$old_text); } set_pconfig(local_channel(),'notes','text',$body); + + $ret['html'] = bbcode($body); + $ret['success'] = true; + } // push updates to channel clones diff --git a/Zotlabs/Web/HTTPSig.php b/Zotlabs/Web/HTTPSig.php index 5aa1e1913..ad10fa182 100644 --- a/Zotlabs/Web/HTTPSig.php +++ b/Zotlabs/Web/HTTPSig.php @@ -323,7 +323,7 @@ class HTTPSig { static function get_webfinger_key($id, $force = false) { if (!$force) { - $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc", + $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s') and hubloc_network in ('zot6', 'activitypub') order by hubloc_id desc", dbesc(str_replace('acct:', '', $id)), dbesc($id) ); @@ -370,7 +370,7 @@ class HTTPSig { static function get_zotfinger_key($id, $force = false) { if (!$force) { - $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where hubloc_addr = '%s' or hubloc_id_url = '%s' and hubloc_network = 'zot6' order by hubloc_id desc", + $x = q("select * from xchan left join hubloc on xchan_hash = hubloc_hash where (hubloc_addr = '%s' or hubloc_id_url = '%s') and hubloc_network = 'zot6' order by hubloc_id desc", dbesc(str_replace('acct:', '', $id)), dbesc($id) ); diff --git a/Zotlabs/Widget/Notes.php b/Zotlabs/Widget/Notes.php index 05c1a0292..66c90ef7d 100644 --- a/Zotlabs/Widget/Notes.php +++ b/Zotlabs/Widget/Notes.php @@ -20,6 +20,7 @@ class Notes { $o = replace_macros($tpl, array( '$banner' => t('Notes'), '$text' => $text, + '$html' => bbcode($text), '$save' => t('Save'), '$app' => ((isset($arr['app'])) ? true : false), '$hidden' => ((isset($arr['hidden'])) ? true : false) |