'+e.version+'
'+e.credits+'
").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("
')})}var src=null,prev=null,livetime=null,msie=!1,stopped=!1,totStopped=!1,timer=null,pr=0,liking=0,in_progress=!1,langSelect=!1,commentBusy=!1,last_popup_menu=null,last_popup_button=null;$(function(){function e(){last_popup_menu&&(last_popup_menu.hide(),last_popup_button.removeClass("selected"),last_popup_menu=null,last_popup_button=null)}$.ajaxSetup({cache:!1}),msie=$.browser.msie,$(".onoff input").each(function(){val=$(this).val(),id=$(this).attr("id"),$("#"+id+"_onoff ."+(val==0?"on":"off")).addClass("hidden")}),$(".onoff > a").click(function(e){e.preventDefault();var t=$(this).siblings("input"),n=1-t.val(),r=t.attr("id");$("#"+r+"_onoff ."+(n==0?"on":"off")).addClass("hidden"),$("#"+r+"_onoff ."+(n==1?"on":"off")).removeClass("hidden"),t.val(n)}),setupFieldRichtext(),$("a[rel^=#]").click(function(t){return e(),menu=$($(this).attr("rel")),t.preventDefault(),t.stopPropagation(),menu.attr("popup")=="false"?!1:($(this).parent().toggleClass("selected"),menu.toggle(),menu.css("display")=="none"?(last_popup_menu=null,last_popup_button=null):(last_popup_menu=menu,last_popup_button=$(this).parent()),!1)}),$("html").click(function(){e()}),$("a.popupbox").fancybox({transitionIn:"elastic",transitionOut:"elastic"});var t=unescape($("#nav-notifications-template[rel=template]").html()),n=unescape($("
").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("notif");c.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),c.children("note").each(function(){e=$(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=c.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var h=$(s).find("sysmsgs");h.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),h.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('
')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t'+e.desc+'
')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t'+e.version+'
'+e.credits+'
").append($("#nav-notifications-see-all").clone()).html()),r=unescape($("
").append($("#nav-notifications-mark-all").clone()).html()),i=unescape($("#nav-notifications-menu").html());$("nav").bind("nav-update",function(e,s){var o=$(s).find("invalid").text();o==1&&(window.location.href=window.location.href);var u=$(s).find("net").text();u==0?(u="",$("#net-update").removeClass("show")):$("#net-update").addClass("show"),$("#net-update").html(u);var a=$(s).find("home").text();a==0?(a="",$("#home-update").removeClass("show")):$("#home-update").addClass("show"),$("#home-update").html(a);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update").removeClass("show")):$("#intro-update").addClass("show"),$("#intro-update").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update").removeClass("show")):$("#mail-update").addClass("show"),$("#mail-update").html(l);var f=$(s).find("intro").text();f==0?(f="",$("#intro-update-li").removeClass("show")):$("#intro-update-li").addClass("show"),$("#intro-update-li").html(f);var l=$(s).find("mail").text();l==0?(l="",$("#mail-update-li").removeClass("show")):$("#mail-update-li").addClass("show"),$("#mail-update-li").html(l);var c=$(s).find("all-events").text();c==0?(c="",$("#allevents-update").removeClass("show")):$("#allevents-update").addClass("show"),$("#allevents-update").html(c);var h=$(s).find("all-events-today").text();h==0?$("#allevents-update").removeClass("notif-allevents-today"):$("#allevents-update").addClass("notif-allevents-today");var p=$(s).find("events").text();p==0?(p="",$("#events-update").removeClass("show")):$("#events-update").addClass("show"),$("#events-update").html(p);var d=$(s).find("events-today").text();d==0?$("#events-update").removeClass("notif-events-today"):$("#events-update").addClass("notif-events-today");var v=$(s).find("birthdays").text();v==0?(v="",$("#birthdays-update").removeClass("show")):$("#birthdays-update").addClass("show"),$("#birthdays-update").html(v);var m=$(s).find("birthdays-today").text();m==0?$("#birthdays-update").removeClass("notif-birthdays-today"):$("#birthdays-update").addClass("notif-birthdays-today");var g=$(s).find("notif");g.children("note").length==0?$("#nav-notifications-menu").html(i):(nnm=$("#nav-notifications-menu"),nnm.html(n+r),g.children("note").each(function(){e=$(this),text=e.text().format(""+e.attr("name")+""),html=t.format(e.attr("href"),e.attr("photo"),text,e.attr("date"),e.attr("seen")),nnm.append(html)})),notif=g.attr("count"),notif>0?$("#nav-notifications-linkmenu").addClass("on"):$("#nav-notifications-linkmenu").removeClass("on"),notif==0?(notif="",$("#notify-update").removeClass("show")):$("#notify-update").addClass("show"),$("#notify-update").html(notif);var y=$(s).find("sysmsgs");y.children("notice").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!0,theme:"notice"})}),y.children("info").each(function(){text=$(this).text(),$.jGrowl(text,{sticky:!1,theme:"info",life:1e4})})}),NavUpdate(),$(document).keydown(function(e){if(e.keyCode=="8"){var t=e.target||e.srcElement;if(!/input|textarea/i.test(t.nodeName))return!1}e.keyCode=="19"||e.ctrlKey&&e.which=="32"?(e.preventDefault(),stopped==0?(stopped=!0,e.ctrlKey&&(totStopped=!0),$("#pause").html('')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t t('Video'),
'$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename),
- '$ww' => (($mode === 'network') ? $commentww : '')
+ '$ww' => (($mode === 'network') ? $commentww : ''),
+ '$rand_num' => random_digits(12)
));
}
}
diff --git a/mod/display.php b/mod/display.php
index be4a0ab9f9..6305dd44e7 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -1,7 +1,7 @@
page['htmlhead'] .= get_markup_template('display-head.tpl');
- $nick = (($a->argc > 1) ? $a->argv[1] : '');
+ if($update) {
+ $nick = $_REQUEST['nick'];
+ }
+ else {
+ $nick = (($a->argc > 1) ? $a->argv[1] : '');
+ }
profile_load($a,$nick);
- $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+ if($update) {
+ $item_id = $_REQUEST['item_id'];
+ }
+ else {
+ $item_id = (($a->argc > 2) ? intval($a->argv[2]) : 0);
+ }
if(! $item_id) {
$a->error = 404;
@@ -97,6 +107,18 @@ function display_content(&$a) {
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
+ if($update) {
+ $r = q("SELECT id FROM item WHERE item.uid = %d
+ AND `item`.`parent` = ( SELECT `parent` FROM `item` WHERE ( `id` = '%s' OR `uri` = '%s' ))
+ $sql_extra AND unseen = 1",
+ intval($a->profile['uid']),
+ dbesc($item_id),
+ dbesc($item_id)
+ );
+ if(!$r)
+ return '';
+ }
+
$r = q("SELECT `item`.*, `item`.`id` AS `item_id`,
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
@@ -124,8 +146,10 @@ function display_content(&$a) {
}
$items = conv_sort($r,"`commented`");
-
- $o .= conversation($a,$items,'display', false);
+
+ if(!$update)
+ $o .= "";
+ $o .= conversation($a,$items,'display', $update);
}
else {
diff --git a/mod/editpost.php b/mod/editpost.php
index 75b686bcd9..1dc6aea21e 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -139,7 +139,8 @@ function editpost_content(&$a) {
'$preview' => t('Preview'),
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
- '$cancel' => t('Cancel')
+ '$cancel' => t('Cancel'),
+ '$rand_num' => random_digits(12)
));
return $o;
diff --git a/mod/item.php b/mod/item.php
index de6bce972c..6dbe99dfd0 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -46,6 +46,19 @@ function item_post(&$a) {
$return_path = ((x($_REQUEST,'return')) ? $_REQUEST['return'] : '');
$preview = ((x($_REQUEST,'preview')) ? intval($_REQUEST['preview']) : 0);
+
+ // Check for doubly-submitted posts, and reject duplicates
+ // Note that we have to ignore previews, otherwise nothing will post
+ // after it's been previewed
+ if(!$preview && x($_REQUEST['post_id_random'])) {
+ if(x($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
+ logger("item post: duplicate post", LOGGER_DEBUG);
+ item_post_return($a->get_baseurl(), $api_source, $return_path);
+ }
+ else
+ $_SESSION['post-random'] = $_REQUEST['post_id_random'];
+ }
+
/**
* Is this a reply to something?
*/
@@ -98,7 +111,7 @@ function item_post(&$a) {
// multi-level threading - preserve the info but re-parent to our single level threading
//if(($parid) && ($parid != $parent))
- $thr_parent = $parent_uri;
+ $thr_parent = $parent_uri;
if($parent_item['contact-id'] && $uid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -873,30 +886,32 @@ function item_post(&$a) {
logger('post_complete');
+ item_post_return($a->get_baseurl(), $api_source, $return_path);
+ // NOTREACHED
+}
+
+function item_post_return($baseurl, $api_source, $return_path) {
// figure out how to return, depending on from whence we came
if($api_source)
return;
if($return_path) {
- goaway($a->get_baseurl() . "/" . $return_path);
+ goaway($baseurl . "/" . $return_path);
}
$json = array('success' => 1);
if(x($_REQUEST,'jsreload') && strlen($_REQUEST['jsreload']))
- $json['reload'] = $a->get_baseurl() . '/' . $_REQUEST['jsreload'];
+ $json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
logger('post_json: ' . print_r($json,true), LOGGER_DEBUG);
echo json_encode($json);
killme();
- // NOTREACHED
}
-
-
function item_content(&$a) {
if((! local_user()) && (! remote_user()))
diff --git a/mod/photos.php b/mod/photos.php
index ced27015b5..67a4b0ad00 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1406,7 +1406,8 @@ function photos_content(&$a) {
'$submit' => t('Submit'),
'$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename),
- '$ww' => ''
+ '$ww' => '',
+ '$rand_num' => random_digits(12)
));
}
}
@@ -1449,7 +1450,8 @@ function photos_content(&$a) {
'$submit' => t('Submit'),
'$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename),
- '$ww' => ''
+ '$ww' => '',
+ '$rand_num' => random_digits(12)
));
}
}
@@ -1520,7 +1522,8 @@ function photos_content(&$a) {
'$submit' => t('Submit'),
'$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename),
- '$ww' => ''
+ '$ww' => '',
+ '$rand_num' => random_digits(12)
));
}
}
diff --git a/mod/update_display.php b/mod/update_display.php
new file mode 100644
index 0000000000..e10af08437
--- /dev/null
+++ b/mod/update_display.php
@@ -0,0 +1,38 @@
+\r\n";
+ echo (($_GET['msie'] == 1) ? '
')):unpause()):totStopped||unpause()})});var lockvisible=!1;String.prototype.format=function(){var e=this;for(var t=0;t' : '');
+
+
+ $text = display_content($a,$profile_uid);
+ $pattern = "/]*) src=\"([^\"]*)\"/";
+ $replace = "
' : '');
+ echo "\r\n";
+ killme();
+
+}
diff --git a/mod/update_network.php b/mod/update_network.php
index 36de0722a9..0dfe0a73ff 100644
--- a/mod/update_network.php
+++ b/mod/update_network.php
@@ -14,25 +14,25 @@ function update_network_content(&$a) {
echo (($_GET['msie'] == 1) ? '' : '');
- $text = network_content($a,$profile_uid);
- $pattern = "/]*) src=\"([^\"]*)\"/";
- $replace = "
' . t('[Embedded content - reload page to view]') . '
'; + $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); - echo str_replace("\t",' ',$text); + echo str_replace("\t",' ',$text); echo (($_GET['msie'] == 1) ? '
' : '');
echo "' . t('[Embedded content - reload page to view]') . '
'; + $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*video[^>]*>(.*?)<\s*\/\s*video>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*embed[^>]*>(.*?)<\s*\/\s*embed>/i"; + $text = preg_replace($pattern, $replace, $text); + $pattern = "/<\s*iframe[^>]*>(.*?)<\s*\/\s*iframe>/i"; + $text = preg_replace($pattern, $replace, $text); - echo str_replace("\t",' ',$text); + echo str_replace("\t",' ',$text); echo (($_GET['msie'] == 1) ? '