bug #147 comments not working on private notes page

12 years ago · 0e441fe196
parent 0c0a604396
commit 0e441fe196
5 changed files with 87 additions and 20 deletions
--- a/boot.php
+++ b/boot.php
@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");


-define ( 'FRIENDIKA_VERSION',      '2.2.1098' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1100' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1087      );

--- a/include/conversation.php
+++ b/include/conversation.php
@ -111,7 +111,7 @@ function conversation(&$a, $items, $mode, $update) {
 	}

 	if($mode === 'notes') {
-		$profile_owner = $a->profile['profile_uid'];
+		$profile_owner = local_user();
 		$page_writeable = true;
 	}

--- a/include/main.js
+++ b/include/main.js
@ -116,6 +116,7 @@
 		if($('#live-network').length)   { src = 'network'; liveUpdate(); }
 		if($('#live-profile').length)   { src = 'profile'; liveUpdate(); }
 		if($('#live-community').length) { src = 'community'; liveUpdate(); }
+		if($('#live-notes').length)     { src = 'notes'; liveUpdate(); }
 		if($('#live-display').length) { 
 			if(liking) {
 				liking = 0;
--- a/mod/notes.php
+++ b/mod/notes.php
@ -14,7 +14,7 @@ function notes_init(&$a) {
 }


-function notes_content(&$a) {
+function notes_content(&$a,$update) {

 	if(! local_user()) {
 		notice( t('Permission denied.') . EOL);
@ -52,31 +52,37 @@ function notes_content(&$a) {
 	));	
 	

-	$o .= '<h3>' . t('Personal Notes') . '</h3>';
+	if(! $update) {
+		$o .= '<h3>' . t('Personal Notes') . '</h3>';

-	$commpage = false;
-	$commvisitor = false;
+		$commpage = false;
+		$commvisitor = false;

-	$celeb = false;
+		$celeb = false;



-	$x = array(
-		'is_owner' => $is_owner,
-       	'allow_location' => (($a->user['allow_location']) ? true : false),
-        'default_location' => $a->user['default-location'],
-        'nickname' => $a->user['nickname'],
-   	    'lockstate' => 'lock',
-       	'acl' => '',
-        'bang' => '',
-        'visitor' => 'block',
-   	    'profile_uid' => local_user(),
-		'button' => t('Save')
+		$x = array(
+			'is_owner' => $is_owner,
+       		'allow_location' => (($a->user['allow_location']) ? true : false),
+	        'default_location' => $a->user['default-location'],
+    	    'nickname' => $a->user['nickname'],
+   	    	'lockstate' => 'lock',
+	       	'acl' => '',
+    	    'bang' => '',
+        	'visitor' => 'block',
+	   	    'profile_uid' => local_user(),
+			'button' => t('Save')

-    );
+    	);

-    $o .= status_editor($a,$x,$a->contact['id']);
+    	$o .= status_editor($a,$x,$a->contact['id']);

+		$o .= '<div id="live-notes"></div>' . "\r\n";
+		$o .= "<script> var profile_uid = " . local_user() 
+			. "; var netargs = '/?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+
+	}

 	// Construct permissions

--- a/mod/update_notes.php
+++ b/mod/update_notes.php
@ -0,0 +1,60 @@
+<?php
+
+/**
+ * Module: update_profile
+ * Purpose: AJAX synchronisation of profile page
+ *
+ */
+
+
+require_once('mod/notes.php');
+
+function update_notes_content(&$a) {
+
+	$profile_uid = intval($_GET['p']);
+
+	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 = notes_content($a,$profile_uid);
+
+	$pattern = "/<img([^>]*) src=\"([^\"]*)\"/";
+	$replace = "<img\${1} dst=\"\${2}\"";
+	$text = preg_replace($pattern, $replace, $text);
+
+	$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();
+
+}