aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--mod/item.php24
-rw-r--r--view/jot.tpl1
-rw-r--r--view/theme/dispy/jot.tpl1
-rw-r--r--view/theme/quattro/jot.tpl1
-rw-r--r--view/theme/testbubble/jot.tpl1
5 files changed, 19 insertions, 9 deletions
diff --git a/mod/item.php b/mod/item.php
index c4e66ebeb..d4d337584 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -54,6 +54,8 @@ function item_post(&$a) {
$parid = 0;
$r = false;
+ $preview = ((x($_POST,'preview')) ? intval($_POST['preview']) : 0);
+
if($parent || $parent_uri) {
if(! x($_POST,'type'))
@@ -280,7 +282,7 @@ function item_post(&$a) {
$match = null;
- if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
+ if((! $preview) && preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) {
$images = $match[1];
if(count($images)) {
foreach($images as $image) {
@@ -323,7 +325,7 @@ function item_post(&$a) {
$match = false;
- if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
+ if((! $preview) && preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) {
$attaches = $match[1];
if(count($attaches)) {
foreach($attaches as $attach) {
@@ -351,13 +353,6 @@ function item_post(&$a) {
$bookmark = 0;
if(preg_match_all("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",$body,$match,PREG_SET_ORDER)) {
$bookmark = 1;
-// foreach($match as $mtch) {
-// $body = str_replace(
-// '[bookmark=' . $mtch[1] . ']' . $mtch[2] . '[/bookmark]',
-// '[url=' . $mtch[1] . ']' . $mtch[2] . '[/url]',
-// $body
-// );
-// }
}
$body = bb_translate_video($body);
@@ -588,6 +583,17 @@ function item_post(&$a) {
else
$datarray['guid'] = get_guid();
+ // preview mode - prepare the body for display and send it via json
+
+ if($preview) {
+ $b = prepare_body($datarray,true);
+ require_once('include/conversation.php');
+ $o = conversation(&$a,array(array_merge($datarray,$contact_record)),'search',false);
+ $json = array('preview' => $o);
+ echo json_encode($json);
+ killme();
+ }
+
call_hooks('post_local',$datarray);
diff --git a/view/jot.tpl b/view/jot.tpl
index 66621db5e..e81c8eb3f 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -13,6 +13,7 @@
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
+ <input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrapper">
<span id="jot-title-desc" style="display: none;">$addtitle</span>
<span id="jot-title-display" style="display: none;"></span>
diff --git a/view/theme/dispy/jot.tpl b/view/theme/dispy/jot.tpl
index 57f320d4c..0ceddb3b7 100644
--- a/view/theme/dispy/jot.tpl
+++ b/view/theme/dispy/jot.tpl
@@ -15,6 +15,7 @@
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
+ <input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrapper">
<span id="jot-title-desc" style="display: none;">$addtitle</span>
<span id="jot-title-display" style="display: none;"></span>
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
index 61ba75234..36008c5a1 100644
--- a/view/theme/quattro/jot.tpl
+++ b/view/theme/quattro/jot.tpl
@@ -13,6 +13,7 @@
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
+ <input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrapper">
<span id="jot-title-desc" style="display: none;">$addtitle</span>
<span id="jot-title-display" style="display: none;"></span>
diff --git a/view/theme/testbubble/jot.tpl b/view/theme/testbubble/jot.tpl
index be536aff4..fa655a13e 100644
--- a/view/theme/testbubble/jot.tpl
+++ b/view/theme/testbubble/jot.tpl
@@ -15,6 +15,7 @@
<input type="hidden" name="location" id="jot-location" value="$defloc" />
<input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="$post_id" />
+ <input type="hidden" name="preview" id="jot-preview" value="0" />
<div id="jot-title-wrapper">
<span id="jot-title-desc" style="display: none;">$addtitle</span>