From 49ccefd6c7add622ba84c72769a68d08ef043ef5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 5 May 2012 17:53:23 -0700
Subject: bad sql left after the mailbox in/out merge

---
 mod/message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index dbca45930..aa8851e46 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -198,7 +198,7 @@ function message_content(&$a) {
 		$o .= $header;
 		
 		$r = q("SELECT count(*) AS `total` FROM `mail` 
-			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC",
+			WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
 			intval(local_user()),
 			dbesc($myprofile)
 		);
-- 
cgit v1.2.3


From 851264161f1b0e638a818a0ebfa80feeb46dfa44 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 6 May 2012 19:55:39 -0700
Subject: mail autcomplete testing

---
 mod/message.php | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index aa8851e46..70b85b84c 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -4,20 +4,7 @@ require_once('include/acl_selectors.php');
 require_once('include/message.php');
 
 function message_init(&$a) {
-	$tabs = array(
-	/*
-		array(
-			'label' => t('All'),
-			'url'=> $a->get_baseurl(true) . '/message',
-			'sel'=> ($a->argc == 1),
-		),
-		array(
-			'label' => t('Sent'),
-			'url' => $a->get_baseurl(true) . '/message/sent',
-			'sel'=> ($a->argv[1] == 'sent'),
-		),
-	*/
-	);
+	$tabs = array();
 	$new = array(
 		'label' => t('New Message'),
 		'url' => $a->get_baseurl(true) . '/message/new',
@@ -29,6 +16,20 @@ function message_init(&$a) {
 		'$tabs'=>$tabs,
 		'$new'=>$new,
 	));
+	$base = $a->get_baseurl();
+
+	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/jquery.autocomplete-min.js" ></script>';
+	$a->page['htmlhead'] .= <<< EOT
+
+<script>$(document).ready(function() { 
+	var a; 
+	a = $("#messageto").autocomplete({ 
+		serviceUrl: '$base/acl'
+	});
+}); 
+
+</script>
+EOT;
 	
 }
 
@@ -171,7 +172,9 @@ function message_content(&$a) {
 	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
 	
-		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+//		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+		$select = '<input type="text" id="messageto" name="messageto" value="' . $preselect .'" />';
+
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
-- 
cgit v1.2.3


From b74a776162b86b6257acf0406e7df4da236c8f09 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 6 May 2012 20:06:39 -0700
Subject: I'll leave the private mail recipient autocomplete partially done.
 Need a good UI/JS person to finish it off.

---
 mod/message.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index 70b85b84c..6fa128808 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -23,7 +23,7 @@ function message_init(&$a) {
 
 <script>$(document).ready(function() { 
 	var a; 
-	a = $("#messageto").autocomplete({ 
+	a = $("#recip").autocomplete({ 
 		serviceUrl: '$base/acl'
 	});
 }); 
@@ -172,8 +172,15 @@ function message_content(&$a) {
 	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
 	
-//		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
-		$select = '<input type="text" id="messageto" name="messageto" value="' . $preselect .'" />';
+		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+
+// here's sort of where we want to do contact autocomplete
+// comment out the contact selector line just above and use the following one instead,
+// then figure out how to make it do the right thing
+// pictures would be nice, but that didn't seem to work when I tried it 
+// (the json backend is found in mod/acl.php)
+
+//		$select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />';
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
-- 
cgit v1.2.3


From 8c2664083531daba2ad3cf3f77a4d9c968314e63 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 6 May 2012 23:06:21 -0700
Subject: reset permissions to forum default when adding forum delivery chain

---
 mod/message.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index 6fa128808..867f199c4 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -24,7 +24,8 @@ function message_init(&$a) {
 <script>$(document).ready(function() { 
 	var a; 
 	a = $("#recip").autocomplete({ 
-		serviceUrl: '$base/acl'
+		serviceUrl: '$base/acl',
+		width: 350
 	});
 }); 
 
-- 
cgit v1.2.3


From c141909f338c259d953ba165a54a09e09fa247ba Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 8 May 2012 01:14:24 -0700
Subject: wrap private message autocomplete in an ifdef to make it easier to
 test/develop

---
 mod/message.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index 867f199c4..b8695fdd9 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -173,15 +173,22 @@ function message_content(&$a) {
 	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
 	
-		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+		if(defined('EMAIL_AUTOCOMP')) {
 
-// here's sort of where we want to do contact autocomplete
-// comment out the contact selector line just above and use the following one instead,
-// then figure out how to make it do the right thing
-// pictures would be nice, but that didn't seem to work when I tried it 
-// (the json backend is found in mod/acl.php)
+			// here's where we want to do contact autocomplete
+			// just figure out how to make it do the right thing
+			// pictures would be nice, but that didn't work when I tried.
+			// It sort of barely works, but needs help
+			// (the json backend is found in mod/acl.php)
 
-//		$select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />';
+			$select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />';
+		}
+		else {
+
+			// the ugly select box
+
+			$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
+		}
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
-- 
cgit v1.2.3


From 774c51cc19c2e1fd135a7f692dd53bfb3a4d0ed3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 10 May 2012 01:45:51 -0700
Subject: email autocomplete

---
 mod/message.php | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index b8695fdd9..8cfa0256c 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -25,8 +25,12 @@ function message_init(&$a) {
 	var a; 
 	a = $("#recip").autocomplete({ 
 		serviceUrl: '$base/acl',
-		width: 350
+		width: 350,
+		onSelect: function(value,data) {
+			$("#recip-complete").val(data);
+		}			
 	});
+
 }); 
 
 </script>
@@ -95,10 +99,6 @@ function message_content(&$a) {
 
 	$myprofile = $a->get_baseurl(true) . '/profile/' . $a->user['nickname'];
 
-
-
-
-
 	$tpl = get_markup_template('mail_head.tpl');
 	$header = replace_macros($tpl, array(
 		'$messages' => t('Messages'),
@@ -173,27 +173,34 @@ function message_content(&$a) {
 	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
 	
-		if(defined('EMAIL_AUTOCOMP')) {
 
-			// here's where we want to do contact autocomplete
-			// just figure out how to make it do the right thing
-			// pictures would be nice, but that didn't work when I tried.
-			// It sort of barely works, but needs help
-			// (the json backend is found in mod/acl.php)
+		$prename = $preurl = $preid = '';
 
-			$select = '<input type="text" id="recip" name="messageto" value="' . $preselect .'" />';
-		}
-		else {
+		if($preselect) {
+			$r = q("select name, url, id from contact where uid = %d and id = %d limit 1",
+				intval(local_user()),
+				intval($a->argv[2])
+			);
+			if(count($r)) {
+				$prename = $r[0]['name'];
+				$preurl = $r[0]['url'];
+				$preid = $r[0]['id'];
+			}
+		}	 
 
-			// the ugly select box
+		$prefill = (($preselect) ? $prename . ' [' . $preurl . ']' : '');
 
-			$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
-		}
+		// the ugly select box
+		
+		$select = contact_select('messageto','message-to-select', $preselect, 4, true, false, false, 10);
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
+			'$prefill' => $prefill,
+			'$autocomp' => $autocomp,
+			'$preid' => $preid,
 			'$subject' => t('Subject:'),
 			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
 			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-- 
cgit v1.2.3


From 547007e1993a21347db327f5c030dd1dac60f28f Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 10 May 2012 19:29:01 -0700
Subject: add photos to PM autocomplete, improved appearance

---
 mod/message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index 8cfa0256c..29a2fa253 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -18,7 +18,7 @@ function message_init(&$a) {
 	));
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/jquery.autocomplete-min.js" ></script>';
+	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
 	$a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() { 
-- 
cgit v1.2.3


From 8a5dcf64d84b98bda80e0346d508efc072c50002 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 10 May 2012 20:01:13 -0700
Subject: fix PM replies after autocomplete changes

---
 mod/message.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'mod/message.php')

diff --git a/mod/message.php b/mod/message.php
index 29a2fa253..71f83b47a 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -172,7 +172,7 @@ function message_content(&$a) {
 		));
 	
 		$preselect = (isset($a->argv[2])?array($a->argv[2]):false);
-	
+			
 
 		$prename = $preurl = $preid = '';
 
@@ -188,7 +188,7 @@ function message_content(&$a) {
 			}
 		}	 
 
-		$prefill = (($preselect) ? $prename . ' [' . $preurl . ']' : '');
+		$prefill = (($preselect) ? $prename  : '');
 
 		// the ugly select box
 		
@@ -198,6 +198,7 @@ function message_content(&$a) {
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Send Private Message'),
 			'$to' => t('To:'),
+			'$showinputs' => 'true', 
 			'$prefill' => $prefill,
 			'$autocomp' => $autocomp,
 			'$preid' => $preid,
@@ -376,9 +377,10 @@ function message_content(&$a) {
 				
 			$seen = $message['seen'];
 		}
+
+
 		$select = $message['name'] . '<input type="hidden" name="messageto" value="' . $contact_id . '" />';
 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
-			
 
 		$tpl = get_markup_template('mail_display.tpl');
 		$o = replace_macros($tpl, array(
@@ -393,6 +395,7 @@ function message_content(&$a) {
 			// reply
 			'$header' => t('Send Reply'),
 			'$to' => t('To:'),
+			'$showinputs' => '',
 			'$subject' => t('Subject:'),
 			'$subjtxt' => template_escape($message['title']),
 			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-- 
cgit v1.2.3