Browse Source

bug #37, ampersand + everything following in url is stripped when using link icon to share link

pull/1/head
Friendika 11 years ago
parent
commit
58508201a5
  1. 23
      include/main.js
  2. 6
      mod/parse_url.php
  3. 2
      mod/share.php
  4. 1
      view/jot-header.tpl

23
include/main.js

@ -255,3 +255,26 @@
return false;
}
function bin2hex(s){
// Converts the binary representation of data to hex
//
// version: 812.316
// discuss at: http://phpjs.org/functions/bin2hex
// + original by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
// + bugfixed by: Onno Marsman
// + bugfixed by: Linuxworld
// * example 1: bin2hex('Kev');
// * returns 1: '4b6576'
// * example 2: bin2hex(String.fromCharCode(0x00));
// * returns 2: '00'
var v,i, f = 0, a = [];
s += '';
f = s.length;
for (i = 0; i<f; i++) {
a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");
}
return a.join('');
}

6
mod/parse_url.php

@ -5,7 +5,11 @@ require_once('library/HTML5/Parser.php');
function parse_url_content(&$a) {
$url = trim($_GET['url']);
logger('parse_url: ' . $_GET['url']);
$url = trim(hex2bin($_GET['url']));
logger('parse_url: ' . $url);
$text = null;

2
mod/share.php

@ -20,4 +20,4 @@ function share_init(&$a) {
$o .= bbcode($r[0]['body'], true);
echo $o . '<br />';
killme();
}
}

1
view/jot-header.tpl

@ -89,6 +89,7 @@ tinyMCE.init({
function jotGetLink() {
reply = prompt("$linkurl");
if(reply && reply.length) {
reply = bin2hex(reply);
$('#profile-rotator').show();
$.get('parse_url?url=' + reply, function(data) {
tinyMCE.execCommand('mceInsertRawHTML',false,data);

Loading…
Cancel
Save