diff --git a/ajax_load_feed.php b/ajax_load_feed.php
index a11d2c608..56e1774ff 100644
--- a/ajax_load_feed.php
+++ b/ajax_load_feed.php
@@ -30,11 +30,12 @@
For more information, please refer to [http://unlicense.org/].
***************************************************************/
-
+require_once( 'settings.inc.php' );
require_once( 'connect.inc.php' );
require_once( 'dbutils.inc.php' );
require_once( 'utilities.inc.php' );
+session_write_close();
$imported_feed=0;
$nif=0;
$msg='';
diff --git a/info.htm b/info.htm
index c24838f0c..77a1ad072 100644
--- a/info.htm
+++ b/info.htm
@@ -249,7 +249,7 @@
- - The current version is 1.6.16 (May 01 2015).
+
- The current version is 1.6.17 (May 09 2015).
-
@@ -2717,6 +2717,11 @@
-
+ - 1.6.17 (May 09 2015):
+ Bugfix: Newsfeed Import doesn't load new links if WordPress is used for multiple users.
+
+
+
- 1.6.16 (May 01 2015):
Improved Sentence Bondary Detection when parsing texts.
User ID is saved in the PHP Session Variable (instead of a Cookie) if wordpress is used to log in.
diff --git a/js/jq_pgm.js b/js/jq_pgm.js
index 131b2af13..5d880d311 100644
--- a/js/jq_pgm.js
+++ b/js/jq_pgm.js
@@ -22,12 +22,12 @@ function word_click_event_do_text_text(){JQ_TOOLTIP&&$("#thetext").data("ui-tool
$(this).text(),$(this).attr("data_wid"),RTL,b):run_overlib_status_1_to_5(WBLINK1,WBLINK2,WBLINK3,JQ_TOOLTIP?make_tooltip($(this).text(),$(this).attr("data_trans"),$(this).attr("data_rom"),a):$(this).attr("title"),TID,$(this).attr("data_order"),$(this).text(),$(this).attr("data_wid"),a,RTL,b);return!1}
function mword_click_event_do_text_text(){JQ_TOOLTIP&&$("#thetext").data("ui-tooltip")&&$("#thetext").tooltip("option",{disabled:!0}).tooltip("close");var a=$(this).attr("data_status");if(""!=a){var b="";"undefined"!=typeof $(this).attr("data_ann")&&(b=$(this).attr("data_ann"));run_overlib_multiword(WBLINK1,WBLINK2,WBLINK3,JQ_TOOLTIP?make_tooltip($(this).text(),$(this).attr("data_trans"),$(this).attr("data_rom"),a):$(this).attr("title"),TID,$(this).attr("data_order"),$(this).attr("data_text"),$(this).attr("data_wid"),
a,$(this).attr("data_code"),b)}return!1}
-function mword_drag_n_drop_select(){JQ_TOOLTIP&&$("#thetext").data("ui-tooltip")&&$("#thetext").tooltip("option",{disabled:!0}).tooltip("close");var a=$(this).parent();a.one("mouseup mouseout",$(this),function(){clearTimeout(to);$(".nword").removeClass("nword");$(".tword").removeClass("tword");$(".lword").removeClass("lword")});to=setTimeout(function(){a.off("mouseout");$(".wsty",a).not(".hide,.word").each(function(){f=2*parseInt($(this).attr("data_code"))+parseInt($(this).attr("data_order"))-1;h=
-"";$(this).nextUntil($('[id^="ID-'+f+'-"]',a),'[id$="-1"]').each(function(){l=$(this).attr("data_order");h="undefined"!=typeof l?h+(''+$(this).text()+""):h+(''+$(this).text()+"")});$(this).html(h)});$('[id$="-1"]',a).not(".hide,.wsty").addClass("nword").each(function(){$(this).attr("data_order",$(this).attr("id").split("-")[1])});$(".word",a).not(".hide").each(function(){$(this).html(''+$(this).text()+""):h+(''+$(this).text()+"")});$(this).html(h)});$('[id$="-1"]',a).not(".hide,.wsty").addClass("nword").each(function(){$(this).attr("data_order",$(this).attr("id").split("-")[1])});$(".word",a).not(".hide").each(function(){$(this).html(''+$(this).text()+"")});$(".wsty",a).not(".hide").each(function(){$(this).children(".tword").last().attr("data_ann",$(this).attr("data_ann")).attr("data_trans",$(this).attr("data_trans")).addClass("content"+$(this).removeClass("status1 status2 status3 status4 status5 status98 status99").attr("data_status"))});$(a).one("mouseover",".tword",function(){$("html").one("mouseup",function(){$(".wsty",a).each(function(){$(this).addClass("status"+$(this).attr("data_status"))});
-$(this).hasClass("tword")||$("span",a).removeClass("nword tword lword")});var b=parseInt($(this).attr("data_order"));$(".lword",a).removeClass("lword");$(this).addClass("lword");$(a).on("mouseleave",function(){$(".lword",a).removeClass("lword")});$(a).one("mouseup",".nword,.tword",function(b){if(!0!==b.handled){var d=$(".lword.tword",a).length;if(0b)for(var d=b;dc;d--)$('.tword[data_order="'+d+'"],.nword[data_order="'+d+'"]',a).addClass("lword")},out:function(){},sensitivity:18,selector:".tword"})})},300)}function word_hover_over(){if(!$(".tword")[0]){JQ_TOOLTIP&&($("#thetext").tooltip("enable"),$(this).trigger("mouseover"));var a=$(this).attr("class").replace(/.*(TERM[^ ]*)( .*)*/,"$1");$("."+a).addClass("hword")}}function word_hover_out(){$(".hword").removeClass("hword");JQ_TOOLTIP&&$(".ui-helper-hidden-accessible>div[style]").remove()}
+$(this).hasClass("tword")||$("span",a).removeClass("nword tword lword")});b=parseInt($(this).attr("data_order"));$(".lword",a).removeClass("lword");$(this).addClass("lword");$(a).on("mouseleave",function(){$(".lword",a).removeClass("lword")});$(a).one("mouseup",".nword,.tword",function(b){if(!0!==b.handled){var d=$(".lword.tword",a).length;if(0b)for(var d=b;dc;d--)$('.tword[data_order="'+d+'"],.nword[data_order="'+d+'"]',a).addClass("lword")},out:function(){},sensitivity:18,selector:".tword"})},300)}function word_hover_over(){if(!$(".tword")[0]){JQ_TOOLTIP&&($("#thetext").tooltip("enable"),$(this).trigger("mouseover"));var a=$(this).attr("class").replace(/.*(TERM[^ ]*)( .*)*/,"$1");$("."+a).addClass("hword")}}function word_hover_out(){$(".hword").removeClass("hword");JQ_TOOLTIP&&$(".ui-helper-hidden-accessible>div[style]").remove()}
jQuery.fn.extend({tooltip_wsty_content:function(){var a=new RegExp("(["+DELIMITER+"])(?! )","g"),b=$(this).hasClass("mwsty")?""+$(this).attr("data_text")+"
":""+$(this).text()+"
",c=$(this).attr("data_rom"),d=$(this).attr("data_trans").replace(a,"$1 "),e="",k=parseInt($(this).attr("data_status"));0==k?e="Unknown [?]":5>k&&(e="Learning ["+k+"]");5==k&&(e="Learned [5]");98==k&&(e="Ignored [Ign]");99==k&&(e="Well Known [WKn]");""!=
c&&(b+="Roman.: "+c+"
");""!=d&&"*"!=d&&($(this).attr("data_ann")&&(a=$(this).attr("data_ann"),""!=a&&"*"!=a&&(a=new RegExp("(.*["+DELIMITER+"][ ]{0,1}|^)("+a.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")+")($|[ ]{0,1}["+DELIMITER+"].*$| \\[.*$)",""),d=d.replace(a,'$1$2$3'))),b+="Transl.: "+d+"
");b+='Status: '+e+"
";$(this).attr("data_img")&&(b+='');return b}});jQuery.fn.extend({tooltip_wsty_init:function(){$(this).tooltip({position:{my:"left top+10",at:"left bottom",collision:"flipfit"},disabled:!0,items:".wsty,.mwsty",show:{easing:"easeOutCirc"},content:function(){return $(this).tooltip_wsty_content()}})}});
diff --git a/src/js/jq_pgm.js b/src/js/jq_pgm.js
index dea8d6787..7e6d8fa1b 100644
--- a/src/js/jq_pgm.js
+++ b/src/js/jq_pgm.js
@@ -418,6 +418,7 @@ function mword_drag_n_drop_select() {
});
to=setTimeout(function(){
+ var pos;
context.off('mouseout');
$('.wsty',context).not('.hide,.word').each(function(){
f=parseInt($(this).attr('data_code'))*2 + parseInt($(this).attr('data_order')) - 1;
@@ -446,7 +447,7 @@ function mword_drag_n_drop_select() {
$('span',context).removeClass('nword tword lword');
}
});
- var pos=parseInt($(this).attr('data_order'));
+ pos=parseInt($(this).attr('data_order'));
$('.lword',context).removeClass('lword');
$(this).addClass('lword');
$(context).on('mouseleave',function(){
@@ -474,22 +475,22 @@ function mword_drag_n_drop_select() {
$(context).off();
}
});
- $(context).hoverIntent({over:function(){
- $('.lword',context).removeClass('lword');
- var lpos=parseInt($(this).attr('data_order'));
- $(this).addClass('lword');
- if(lpos>pos){
- for(var i=pos;ipos){
+ for(var i=pos;ilpos;i--){
- $('.tword[data_order="' + i + '"],.nword[data_order="' + i + '"]',context).addClass('lword');
- }
+ }
+ else{
+ for(var i=pos;i>lpos;i--){
+ $('.tword[data_order="' + i + '"],.nword[data_order="' + i + '"]',context).addClass('lword');
}
- },out:function(){}, sensitivity: 18, selector:".tword"});
- });
+ }
+ },out:function(){}, sensitivity: 18, selector:".tword"});
}, 300);
}
diff --git a/utilities.inc.php b/utilities.inc.php
index 15d2e4e32..7a4dc7aea 100644
--- a/utilities.inc.php
+++ b/utilities.inc.php
@@ -539,7 +539,7 @@ function get_text_from_rsslink($feed_data,$NfArticleSection,$NfFilterTags,$NfCha
function get_version() {
global $debug;
- return '1.6.16 (May 01 2015)' .
+ return '1.6.17 (May 09 2015)' .
($debug ? ' DEBUG' : '');
}