aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/conversation.php3
-rw-r--r--include/enotify.php7
-rw-r--r--js/main.js1
-rw-r--r--mod/item.php4
-rw-r--r--mod/search.php57
-rw-r--r--mod/update_search.php66
-rw-r--r--version.inc2
7 files changed, 107 insertions, 33 deletions
diff --git a/include/conversation.php b/include/conversation.php
index a615dfcc5..59624959f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -512,9 +512,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional') {
// - just loop through the items and format them minimally for display
-
-
-
//$tpl = get_markup_template('search_item.tpl');
$tpl = 'search_item.tpl';
diff --git a/include/enotify.php b/include/enotify.php
index 07e660191..a2b7b67b0 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -297,9 +297,16 @@ function notification($params) {
$datarray['type'] = $params['type'];
$datarray['verb'] = $params['verb'];
$datarray['otype'] = $params['otype'];
+ $datarray['abort'] = false;
call_hooks('enotify_store', $datarray);
+ if($datarray['abort']) {
+ pop_lang();
+ return;
+ }
+
+
// create notification entry in DB
$r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype)
diff --git a/js/main.js b/js/main.js
index c330b3c69..0fbc4b517 100644
--- a/js/main.js
+++ b/js/main.js
@@ -270,6 +270,7 @@
if($('#live-channel').length) { src = 'channel'; liveUpdate(); }
if($('#live-community').length) { src = 'community'; liveUpdate(); }
if($('#live-display').length) { src = 'display'; liveUpdate(); }
+ if($('#live-search').length) { src = 'search'; liveUpdate(); }
if($('#live-photos').length) {
if(liking) {
diff --git a/mod/item.php b/mod/item.php
index 814c2f0c6..a8d1bdf31 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -60,6 +60,7 @@ function item_post(&$a) {
$origin = (($api_source && array_key_exists('origin',$_REQUEST)) ? intval($_REQUEST['origin']) : 1);
$owner_hash = null;
+ $message_id = ((x($_REQUEST,'message_id') && $api_source) ? strip_tags($_REQUEST['message_id']) : '');
$profile_uid = ((x($_REQUEST,'profile_uid')) ? intval($_REQUEST['profile_uid']) : 0);
$post_id = ((x($_REQUEST,'post_id')) ? intval($_REQUEST['post_id']) : 0);
@@ -481,7 +482,8 @@ function item_post(&$a) {
$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
- $mid = item_message_id();
+ $mid = (($message_id) ? $message_id : item_message_id());
+
$parent_mid = $mid;
if($parent_item)
$parent_mid = $parent_item['mid'];
diff --git a/mod/search.php b/mod/search.php
index 453b01c65..4e093d865 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -74,7 +74,7 @@ function search_post(&$a) {
}
-function search_content(&$a) {
+function search_content(&$a,$update = 0, $load = false) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
@@ -153,7 +153,7 @@ function search_content(&$a) {
// because browser prefetching might change it on us. We have to deliver it with the page.
$o .= '<div id="live-search"></div>' . "\r\n";
- $o .= "<script> var profile_uid = " . $a->profile['profile_uid']
+ $o .= "<script> var profile_uid = " . intval(local_user())
. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
$a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array(
@@ -187,7 +187,7 @@ function search_content(&$a) {
if(($update) && ($load)) {
$pager_sql = sprintf(" LIMIT %d, %d ",intval($a->pager['start']), intval($a->pager['itemspage']));
-
+dbg(1);
if($load) {
$r = q("SELECT distinct(mid), item.* from item
WHERE item_restrict = 0
@@ -199,6 +199,7 @@ function search_content(&$a) {
intval(ABOOK_FLAG_BLOCKED)
);
+dbg(0);
}
else {
$r = array();
@@ -211,7 +212,7 @@ function search_content(&$a) {
$items = q("SELECT `item`.*, `item`.`id` AS `item_id`
FROM `item`
- WHERE item_restrict = 0 and
+ WHERE item_restrict = 0
$sql_extra ",
intval($a->profile['profile_uid']),
dbesc($parents_str)
@@ -227,33 +228,33 @@ function search_content(&$a) {
- $r = q("SELECT distinct(`item`.`mid`), `item`.*, `item`.`id` AS `item_id`,
- `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
- `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
- `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
- `user`.`nickname`
- FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
- WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
- AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
- OR `item`.`uid` = %d )
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- $sql_extra
- group by `item`.`mid`
- ORDER BY `received` DESC LIMIT %d , %d ",
- intval(local_user()),
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
+// $r = q("SELECT distinct(`item`.`mid`), `item`.*, `item`.`id` AS `item_id`,
+// `contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`alias`, `contact`.`rel`,
+// `contact`.`network`, `contact`.`thumb`, `contact`.`self`, `contact`.`writable`,
+// `contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`,
+// `user`.`nickname`
+// FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+// LEFT JOIN `user` ON `user`.`uid` = `item`.`uid`
+// WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+// AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 )
+// OR `item`.`uid` = %d )
+// AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
+// $sql_extra
+// group by `item`.`mid`
+// ORDER BY `received` DESC LIMIT %d , %d ",
+// intval(local_user()),
+// intval($a->pager['start']),
+// intval($a->pager['itemspage'])
- );
+// );
// $a = fetch_post_tags($a,true);
- if(! count($r)) {
- info( t('No results.') . EOL);
- return $o;
- }
+// if(! $items) {//
+// info( t('No results.') . EOL);
+// return $o;
+// }
if($tag)
@@ -261,9 +262,9 @@ function search_content(&$a) {
else
$o .= '<h2>Search results for: ' . htmlspecialchars($search) . '</h2>';
- $o .= conversation($a,$r,'search',false);
+ $o .= conversation($a,$items,'search',$update,'client');
- $o .= alt_pager($a,count($r));
+// $o .= alt_pager($a,count($r));
return $o;
}
diff --git a/mod/update_search.php b/mod/update_search.php
new file mode 100644
index 000000000..ec7599b79
--- /dev/null
+++ b/mod/update_search.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * Module: update_profile
+ * Purpose: AJAX synchronisation of search page
+ *
+ */
+
+
+require_once('mod/search.php');
+
+function update_search_content(&$a) {
+
+ $profile_uid = intval($_GET['p']);
+ if(! $profile_uid)
+ $profile_uid = (-1);
+
+ $load = (((argc() > 1) && (argv(1) == 'load')) ? 1 : 0);
+
+ header("Content-type: text/html");
+ echo "<!DOCTYPE html><html><body>\r\n";
+
+ /**
+ * We can remove this hack once Internet Explorer recognises HTML5 natively
+ */
+
+ echo (($_GET['msie'] == 1) ? '<div>' : '<section>');
+
+ /**
+ *
+ * Grab the page inner contents by calling the content function from the profile module directly,
+ * but move any image src attributes to another attribute name. This is because
+ * some browsers will prefetch all the images for the page even if we don't need them.
+ * The only ones we need to fetch are those for new page additions, which we'll discover
+ * on the client side and then swap the image back.
+ *
+ */
+
+ $text = search_content($a,$profile_uid,$load);
+
+ $pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
+ $replace = "<img\${1} dst=\"\${2}\"";
+ $text = preg_replace($pattern, $replace, $text);
+
+ if(! $load) {
+ $replace = '<br />' . t('[Embedded content - reload page to view]') . '<br />';
+ $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);
+ }
+
+ /**
+ * reportedly some versions of MSIE don't handle tabs in XMLHttpRequest documents very well
+ */
+
+ echo str_replace("\t",' ',$text);
+ echo (($_GET['msie'] == 1) ? '</div>' : '</section>');
+ echo "</body></html>\r\n";
+ killme();
+
+} \ No newline at end of file
diff --git a/version.inc b/version.inc
index efe2b94cc..702a531d6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-05-08.307
+2013-05-09.308
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 17:31:10 +0000