From afce790e56ba7cd4c5c049e7c3a9aac20846981e Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 25 Oct 2011 14:59:31 +0200 Subject: [PATCH 1/6] oembed: wrap in iframe only html from remote service --- include/bbcode.php | 2 +- include/oembed.php | 12 ++-- js/webtoolkit.base64.js | 142 ++++++++++++++++++++++++++++++++++++++++ view/oembed_video.tpl | 2 +- 4 files changed, 150 insertions(+), 8 deletions(-) create mode 100644 js/webtoolkit.base64.js diff --git a/include/bbcode.php b/include/bbcode.php index e20b2478d3..d7b64c0cf1 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -19,7 +19,7 @@ function tryoembed($match){ if ($o->type=="error") return $match[0]; $html = oembed_format_object($o); - return oembed_iframe($html,$o->width,$o->height); + return $html; //oembed_iframe($html,$o->width,$o->height); } diff --git a/include/oembed.php b/include/oembed.php index 71b62b839d..3e86627e4d 100644 --- a/include/oembed.php +++ b/include/oembed.php @@ -4,7 +4,7 @@ function oembed_replacecb($matches){ $embedurl=$matches[1]; $j = oembed_fetch_url($embedurl); $s = oembed_format_object($j); - return oembed_iframe($s,$j->width,$j->height); + return $s;//oembed_iframe($s,$j->width,$j->height); } @@ -56,6 +56,7 @@ function oembed_fetch_url($embedurl){ function oembed_format_object($j){ $embedurl = $j->embedurl; + $jhtml = oembed_iframe($j->html,$j->width,$j->height ); $ret=""; switch ($j->type) { case "video": { @@ -68,14 +69,14 @@ function oembed_format_object($j){ $tpl=get_markup_template('oembed_video.tpl'); $ret.=replace_macros($tpl, array( '$embedurl'=>$embedurl, - '$escapedhtml'=>urlencode($j->html), + '$escapedhtml'=>base64_encode($jhtml), '$tw'=>$tw, '$th'=>$th, '$turl'=>$j->thumbnail_url, )); } else { - $ret=$j->html; + $ret=$jhtml; } $ret.="
"; }; break; @@ -88,12 +89,12 @@ function oembed_format_object($j){ }; break; case "rich": { // not so safe.. - $ret.= $j->html; + $ret.= $jhtml; }; break; } // add link to source if not present in "rich" type - if ( $j->type!='rich' || !strpos($ret,$embedurl) ){ + if ( $j->type!='rich' || !strpos($j->html,$embedurl) ){ $embedlink = (isset($j->title))?$j->title:$embedurl; $ret .= "$embedlink"; if (isset($j->author_name)) $ret.=" by ".$j->author_name; @@ -107,7 +108,6 @@ function oembed_format_object($j){ } function oembed_iframe($src,$width,$height) { - if(! $width || strstr($width,'%')) $width = '640'; if(! $height || strstr($height,'%')) diff --git a/js/webtoolkit.base64.js b/js/webtoolkit.base64.js new file mode 100644 index 0000000000..5fa3c1ed7b --- /dev/null +++ b/js/webtoolkit.base64.js @@ -0,0 +1,142 @@ +/** +* +* Base64 encode / decode +* http://www.webtoolkit.info/ +* +**/ + +var Base64 = { + + // private property + _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=", + + // public method for encoding + encode : function (input) { + var output = ""; + var chr1, chr2, chr3, enc1, enc2, enc3, enc4; + var i = 0; + + input = Base64._utf8_encode(input); + + while (i < input.length) { + + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); + + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; + + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } + + output = output + + this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) + + this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4); + + } + + return output; + }, + + // public method for decoding + decode : function (input) { + var output = ""; + var chr1, chr2, chr3; + var enc1, enc2, enc3, enc4; + var i = 0; + + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + + while (i < input.length) { + + enc1 = this._keyStr.indexOf(input.charAt(i++)); + enc2 = this._keyStr.indexOf(input.charAt(i++)); + enc3 = this._keyStr.indexOf(input.charAt(i++)); + enc4 = this._keyStr.indexOf(input.charAt(i++)); + + chr1 = (enc1 << 2) | (enc2 >> 4); + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); + chr3 = ((enc3 & 3) << 6) | enc4; + + output = output + String.fromCharCode(chr1); + + if (enc3 != 64) { + output = output + String.fromCharCode(chr2); + } + if (enc4 != 64) { + output = output + String.fromCharCode(chr3); + } + + } + + output = Base64._utf8_decode(output); + + return output; + + }, + + // private method for UTF-8 encoding + _utf8_encode : function (string) { + string = string.replace(/\r\n/g,"\n"); + var utftext = ""; + + for (var n = 0; n < string.length; n++) { + + var c = string.charCodeAt(n); + + if (c < 128) { + utftext += String.fromCharCode(c); + } + else if((c > 127) && (c < 2048)) { + utftext += String.fromCharCode((c >> 6) | 192); + utftext += String.fromCharCode((c & 63) | 128); + } + else { + utftext += String.fromCharCode((c >> 12) | 224); + utftext += String.fromCharCode(((c >> 6) & 63) | 128); + utftext += String.fromCharCode((c & 63) | 128); + } + + } + + return utftext; + }, + + // private method for UTF-8 decoding + _utf8_decode : function (utftext) { + var string = ""; + var i = 0; + var c = c1 = c2 = 0; + + while ( i < utftext.length ) { + + c = utftext.charCodeAt(i); + + if (c < 128) { + string += String.fromCharCode(c); + i++; + } + else if((c > 191) && (c < 224)) { + c2 = utftext.charCodeAt(i+1); + string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)); + i += 2; + } + else { + c2 = utftext.charCodeAt(i+1); + c3 = utftext.charCodeAt(i+2); + string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)); + i += 3; + } + + } + + return string; + } + +} diff --git a/view/oembed_video.tpl b/view/oembed_video.tpl index 29b5149ba2..5824d8d4e8 100644 --- a/view/oembed_video.tpl +++ b/view/oembed_video.tpl @@ -1,4 +1,4 @@ - +
From bcb672e7ff859168b639ffffc38553bbcf7e918c Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 25 Oct 2011 15:01:58 +0200 Subject: [PATCH 2/6] autocomplete contacts nickname while writting in a comment box. --- js/fk.autocomplete.js | 154 ++++++++++++++++++++++++++++++++++++++++ js/jquery.textinputs.js | 20 ++++++ js/main.js | 9 ++- mod/acl.php | 6 +- view/head.tpl | 3 + 5 files changed, 187 insertions(+), 5 deletions(-) create mode 100644 js/fk.autocomplete.js create mode 100644 js/jquery.textinputs.js diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js new file mode 100644 index 0000000000..ac7c2ce4e4 --- /dev/null +++ b/js/fk.autocomplete.js @@ -0,0 +1,154 @@ +/** + * Friendika people autocomplete + * + * require jQuery, jquery.textareas + */ + + + +function ACPopup(elm,backend_url){ + this.idsel=-1; + this.element = elm; + this.searchText=""; + this.ready=true; + this.kp_timer = false; + this.url = backend_url; + + style = $(elm).offset(); + w = $(elm).width(); + h = $(elm).height(); + style.top=style.top+h; + style.height = '150px'; + style.width = w; + style.border = '1px solid red'; + style.background = '#cccccc'; + style.position = 'absolute'; + style.overflow = 'auto'; + style['z-index'] = '100000'; + + this.cont = $("
"); + this.cont.css(style); + + $(elm).after(this.cont); +} +ACPopup.prototype.close = function(){ + $(this.cont).remove(); + this.ready=false; +} +ACPopup.prototype.search = function(text){ + this.searchText=text; + /*if (this.kp_timer) clearTimeout(this.kp_timer); + this.kp_timer = setTimeout( this._search, 1000);*/ + this._search(); +} +ACPopup.prototype._search = function(){ + + var that = this; + var postdata = { + start:0, + count:100, + search:this.searchText, + } + + $.ajax({ + type:'POST', + url: this.url, + data: postdata, + dataType: 'json', + success:function(data){ + that.cont.html(""); + $(data.items).each(function(){ + if (this.type=="c"){ + html = "{1} ({2})".format(this.photo, this.name, this.nick) + that.add(html, this.nick); + } + }); + } + }); + +} +ACPopup.prototype.add = function(label, value){ + var that=this; + var elm = $("
"+label+"
"); + elm.click(function(e){ + t = $(this).attr('title'); + el=$(that.element); + sel = el.getSelection(); + sel.start = sel.start- that.searchText.length; + el.setSelection(sel.start,sel.end).replaceSelectedText(t).collapseSelection(false); + that.close(); + }); + $(this.cont).append(elm); +} +ACPopup.prototype.onkey = function(event){ + if (event.keyCode == '13' && this.idsel>-1) { + this.cont.children()[this.idsel].click(); + event.preventDefault(); + } + if (event.keyCode == '38') { //cursor up + cmax = this.cont.children().size()-1; + this.idsel--; + if (this.idsel<0) this.idsel=cmax; + event.preventDefault(); + } + if (event.keyCode == '40') { //cursor down + cmax = this.cont.children().size()-1; + this.idsel++; + if (this.idsel>cmax) this.idsel=0; + event.preventDefault(); + } + + if (event.keyCode == '38' || event.keyCode == '40' ) { + this.cont.children().css({background:'#cccccc'}).removeClass('selected'); + $(this.cont.children()[this.idsel]).css({background:'#ccccff'}).addClass('selected'); + } + + if (event.keyCode == '27') { //ESC + this.close(); + } +} + +function ContactAutocomplete(element,backend_url){ + this.pattern=/@([^ \n]+)$/; + this.popup=null; + var that = this; + + $(element).keydown(function(event){ + if (that.popup!==null) that.popup.onkey(event); + }); + + $(element).keyup(function(event){ + cpos = $(this).getSelection(); + if (cpos.start==cpos.end){ + match = $(this).val().substring(0,cpos.start).match(that.pattern); + if (match!==null){ + if (that.popup===null){ + that.popup = new ACPopup(this, backend_url); + } + if (that.popup.ready && match[1]!==that.popup.searchText) that.popup.search(match[1]); + if (!that.popup.ready) that.popup=null; + + } else { + if (that.popup!==null) {that.popup.close(); that.popup=null;} + } + + + } + }); + +} + +/** + * jQuery plugin 'contact_autocomplete' + */ +(function( $ ){ + $.fn.contact_autocomplete = function(backend_url) { + this.each(function(){ + new ContactAutocomplete(this, backend_url); + }); + }; +})( jQuery ); + + + + diff --git a/js/jquery.textinputs.js b/js/jquery.textinputs.js new file mode 100644 index 0000000000..fd6d145690 --- /dev/null +++ b/js/jquery.textinputs.js @@ -0,0 +1,20 @@ +/* + Rangy Text Inputs, a cross-browser textarea and text input library plug-in for jQuery. + + Part of Rangy, a cross-browser JavaScript range and selection library + http://code.google.com/p/rangy/ + + Depends on jQuery 1.0 or later. + + Copyright 2010, Tim Down + Licensed under the MIT license. + Version: 0.1.205 + Build date: 5 November 2010 +*/ +(function(n){function o(e,g){var a=typeof e[g];return a==="function"||!!(a=="object"&&e[g])||a=="unknown"}function p(e,g,a){if(g<0)g+=e.value.length;if(typeof a=="undefined")a=g;if(a<0)a+=e.value.length;return{start:g,end:a}}function k(){return typeof document.body=="object"&&document.body?document.body:document.getElementsByTagName("body")[0]}var i,h,q,l,r,s,t,u,m;n(document).ready(function(){function e(a,b){return function(){var c=this.jquery?this[0]:this,d=c.nodeName.toLowerCase();if(c.nodeType== +1&&(d=="textarea"||d=="input"&&c.type=="text")){c=[c].concat(Array.prototype.slice.call(arguments));c=a.apply(this,c);if(!b)return c}if(b)return this}}var g=document.createElement("textarea");k().appendChild(g);if(typeof g.selectionStart!="undefined"&&typeof g.selectionEnd!="undefined"){i=function(a){return{start:a.selectionStart,end:a.selectionEnd,length:a.selectionEnd-a.selectionStart,text:a.value.slice(a.selectionStart,a.selectionEnd)}};h=function(a,b,c){b=p(a,b,c);a.selectionStart=b.start;a.selectionEnd= +b.end};m=function(a,b){if(b)a.selectionEnd=a.selectionStart;else a.selectionStart=a.selectionEnd}}else if(o(g,"createTextRange")&&typeof document.selection=="object"&&document.selection&&o(document.selection,"createRange")){i=function(a){var b=0,c=0,d,f,j;if((j=document.selection.createRange())&&j.parentElement()==a){f=a.value.length;d=a.value.replace(/\r\n/g,"\n");c=a.createTextRange();c.moveToBookmark(j.getBookmark());j=a.createTextRange();j.collapse(false);if(c.compareEndPoints("StartToEnd",j)> +-1)b=c=f;else{b=-c.moveStart("character",-f);b+=d.slice(0,b).split("\n").length-1;if(c.compareEndPoints("EndToEnd",j)>-1)c=f;else{c=-c.moveEnd("character",-f);c+=d.slice(0,c).split("\n").length-1}}}return{start:b,end:c,length:c-b,text:a.value.slice(b,c)}};h=function(a,b,c){b=p(a,b,c);c=a.createTextRange();var d=b.start-(a.value.slice(0,b.start).split("\r\n").length-1);c.collapse(true);if(b.start==b.end)c.move("character",d);else{c.moveEnd("character",b.end-(a.value.slice(0,b.end).split("\r\n").length- +1));c.moveStart("character",d)}c.select()};m=function(a,b){var c=document.selection.createRange();c.collapse(b);c.select()}}else{k().removeChild(g);window.console&&window.console.log&&window.console.log("TextInputs module for Rangy not supported in your browser. Reason: No means of finding text input caret position");return}k().removeChild(g);l=function(a,b,c,d){var f;if(b!=c){f=a.value;a.value=f.slice(0,b)+f.slice(c)}d&&h(a,b,b)};q=function(a){var b=i(a);l(a,b.start,b.end,true)};u=function(a){var b= +i(a),c;if(b.start!=b.end){c=a.value;a.value=c.slice(0,b.start)+c.slice(b.end)}h(a,b.start,b.start);return b.text};r=function(a,b,c,d){var f=a.value;a.value=f.slice(0,c)+b+f.slice(c);if(d){b=c+b.length;h(a,b,b)}};s=function(a,b){var c=i(a),d=a.value;a.value=d.slice(0,c.start)+b+d.slice(c.end);c=c.start+b.length;h(a,c,c)};t=function(a,b,c){var d=i(a),f=a.value;a.value=f.slice(0,d.start)+b+d.text+c+f.slice(d.end);b=d.start+b.length;h(a,b,b+d.length)};n.fn.extend({getSelection:e(i,false),setSelection:e(h, +true),collapseSelection:e(m,true),deleteSelectedText:e(q,true),deleteText:e(l,true),extractSelectedText:e(u,false),insertText:e(r,true),replaceSelectedText:e(s,true),surroundSelectedText:e(t,true)})})})(jQuery); \ No newline at end of file diff --git a/js/main.js b/js/main.js index 03ba11ed84..15c5b5d1f1 100644 --- a/js/main.js +++ b/js/main.js @@ -78,8 +78,6 @@ menu.toggle(); return false; }); - - /* notifications template */ var notifications_tpl= unescape($("#nav-notifications-template[rel=template]").html()); @@ -163,7 +161,9 @@ } } - }); + }); + + }); function NavUpdate() { @@ -245,6 +245,8 @@ commentBusy = false; $('body').css('cursor', 'auto'); } + /* autocomplete @nicknames */ + $(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl"); }); } @@ -445,6 +447,7 @@ function setupFieldRichtext(){ }); } + /** * sprintf in javascript * "{0} and {1}".format('zero','uno'); diff --git a/mod/acl.php b/mod/acl.php index f2d2456a64..d87c8de777 100644 --- a/mod/acl.php +++ b/mod/acl.php @@ -13,6 +13,7 @@ function acl_init(&$a){ if ($search!=""){ $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'"; + $sql_extra2 = "AND (`name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')"; } // count groups and contacts @@ -59,9 +60,9 @@ function acl_init(&$a){ } - $r = q("SELECT `id`, `name`, `micro`, `network`, `url` FROM `contact` + $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' - $sql_extra + $sql_extra2 ORDER BY `name` ASC ", intval(local_user()) ); @@ -73,6 +74,7 @@ function acl_init(&$a){ "id" => intval($g['id']), "network" => $g['network'], "link" => $g['url'], + "nick" => $g['nick'], ); } diff --git a/view/head.tpl b/view/head.tpl index b6d78da390..752915b146 100644 --- a/view/head.tpl +++ b/view/head.tpl @@ -17,11 +17,14 @@ + + +