Merge branch 'master' into trinidad

boot.php

@@ -221,7 +221,7 @@ define ( 'PAGE_NORMAL',            0x0000 );
 define ( 'PAGE_HIDDEN',            0x0001 );
 define ( 'PAGE_AUTOCONNECT',       0x0002 );
 define ( 'PAGE_APPLICATION',       0x0004 );
-define ( 'PAGE_DIRECTORY_CHANNEL', 0x0008 ); // system channel used for directory synchronisation
+
 define ( 'PAGE_PREMIUM',           0x0010 );
 define ( 'PAGE_ADULT',             0x0020 );
 define ( 'PAGE_CENSORED',          0x0040 ); // Site admin has blocked this channel from appearing in casual search results and site feeds
@@ -554,7 +554,7 @@ define ( 'ITEM_DELAYED_PUBLISH', 0x0080);
 define ( 'ITEM_BUILDBLOCK',      0x0100);	// Named thusly to make sure nobody confuses this with ITEM_BLOCKED
 define ( 'ITEM_PDL',			 0x0200);	// Page Description Language - e.g. Comanche
 define ( 'ITEM_BUG',			 0x0400);	// Is a bug, can be used by the internal bug tracker
-define ( 'ITEM_PENDING_REMOVE',  0x0800);  // deleted, notification period has lapsed
+define ( 'ITEM_PENDING_REMOVE',  0x0800);   // deleted, notification period has lapsed
 
 /**
  * Item Flags

include/Contact.php

@@ -519,6 +519,8 @@ function contact_remove($channel_id, $abook_id) {
 	if((! $channel_id) || (! $abook_id))
 		return false;
 
+	logger('removing contact ' . $abook_id . ' for channel ' . $channel_id,LOGGER_DEBUG);
+
 	$archive = get_pconfig($channel_id, 'system','archive_removed_contacts');
 	if($archive) {
 		q("update abook set abook_flags = ( abook_flags | %d ) where abook_id = %d and abook_channel = %d",

include/nav.php

@@ -15,15 +15,7 @@ function nav(&$a) {
     $a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() {
-    var a;
+	$("#nav-search-text").search_autocomplete('$base/acl');
-    a = $("#nav-search-text").autocomplete({
-        serviceUrl: '$base/acl',
-        minChars: 2,
-        width: 250,
-        id: 'nav-search-text-ac',
-    });
-    a.setOptions({ autoSubmit: true, params: { type: 'x' }});
-
 });
 
 </script>

library/jquery-textcomplete/jquery.textcomplete.js

@@ -124,8 +124,9 @@ if (typeof jQuery === 'undefined') {
     this.views      = [];
     this.option     = $.extend({}, Completer._getDefaults(), option);
 
-    if (!this.$el.is('textarea') && !element.isContentEditable && element.contentEditable != 'true') {
+
-      throw new Error('textcomplete must be called on a Textarea or a ContentEditable.');
+    if (!this.$el.is('input[type=text]') && !this.$el.is('textarea') && !element.isContentEditable && element.contentEditable != 'true') {
+      throw new Error('textcomplete must be called on a input[type=text], Textarea or a ContentEditable.');
     }
 
     if (element === document.activeElement) {
@@ -171,7 +172,7 @@ if (typeof jQuery === 'undefined') {
       if (this.option.adapter) {
         Adapter = this.option.adapter;
       } else {
-        if (this.$el.is('textarea')) {
+        if (this.$el.is('textarea') || this.$el.is('input[type=text]')) {
           viewName = typeof element.selectionEnd === 'number' ? 'Textarea' : 'IETextarea';
         } else {
           viewName = 'ContentEditable';

mod/acl.php

@@ -182,49 +182,29 @@ function acl_init(&$a){
 		);
 	}
 	elseif($type == 'x') {
-
 		$r = navbar_complete($a);
-		$x = array();
+		$contacts = array();
-		$x['query']       = $search;
-		$x['photos']      = array();
-		$x['links']       = array();
-		$x['suggestions'] = array();
-		$x['data']        = array();
 		if($r) {
 			foreach($r as $g) {
-				$x['photos'][]      = $g['photo'];
+				$contacts[] = array(
-				$x['links'][]       = $g['url'];
+					"photo"    => $g['photo'],
-				$x['suggestions'][] = '@' .  $g['name'];
+					"name"     => $g['name'],
-				$x['data'][]        = $g['name'];
+					"nick"     => $g['address'],
+				);
 			}
 		}
-		echo json_encode($x);
-		killme();
 
+		$o = array(
+			'start' => $start,
+			'count'	=> $count,
+			'items'	=> $contacts,
+		);
+		echo json_encode($o);
+		killme();
 	}
 	else
 		$r = array();
 
-
-	if($type == 'm' || $type == 'a' || $type == 'p') {
-		$x = array();
-		$x['query']       = $search;
-		$x['photos']      = array();
-		$x['links']       = array();
-		$x['suggestions'] = array();
-		$x['data']        = array();
-		if(count($r)) {
-			foreach($r as $g) {
-				$x['photos'][]      = $g['micro'];
-				$x['links'][]       = $g['url'];
-				$x['suggestions'][] = $g['name'];
-				$x['data'][]        = (($type === 'p') ? '@' . str_replace(' ','_',$g['name']) : $g['id']);
-			}
-		}
-		echo json_encode($x);
-		killme();
-	}
-
 	if(count($r)) {
 		foreach($r as $g){
 
@@ -284,7 +264,7 @@ function navbar_complete(&$a) {
 	}
 
 	$dirmode = intval(get_config('system','directory_mode'));
-	$search = ((x($_REQUEST,'query')) ? htmlentities($_REQUEST['query'],ENT_COMPAT,'UTF-8',false) : '');
+	$search = ((x($_REQUEST,'search')) ? htmlentities($_REQUEST['search'],ENT_COMPAT,'UTF-8',false) : '');
 	if(! $search || mb_strlen($search) < 2)
 		return array();
 

mod/admin.php

@@ -827,7 +827,7 @@ function admin_page_channels(&$a){
 	/* get channels */
 
 	$total = q("SELECT count(*) as total FROM channel where not (channel_pageflags & %d)>0",
-		intval(PAGE_REMOVED)
+		intval(PAGE_REMOVED|PAGE_SYSTEM)
 	);
 	if($total) {
 		$a->set_pager_total($total[0]['total']);
@@ -837,7 +837,7 @@ function admin_page_channels(&$a){
 	$order = " order by channel_name asc ";
 
 	$channels = q("SELECT * from channel where not ( channel_pageflags & %d )>0 $order limit %d offset %d ",
-		intval(PAGE_REMOVED),
+		intval(PAGE_REMOVED|PAGE_SYSTEM),
 		intval($a->pager['itemspage']),
 		intval($a->pager['start'])
 	);

mod/connections.php

@@ -179,7 +179,8 @@ function connections_content(&$a) {
 	$unconnected = false;
 	$all         = false;
 
-	$_SESSION['return_url'] = $a->query_string;
+	if(! $_REQUEST['aj'])
+		$_SESSION['return_url'] = $a->query_string;
 
 	$search_flags = 0;
 	$head = '';

mod/connedit.php

@@ -216,10 +216,9 @@ function connedit_post(&$a) {
 		$arr = array('channel_id' => local_user(), 'abook' => $a->poi);
 		call_hooks('accept_follow', $arr);
 	}
-dbg(1);
+
 	if(! is_null($autoperms)) 
 		set_pconfig(local_user(),'system','autoperms',(($autoperms) ? $abook_my_perms : 0));
-dbg(0);
 
 	connedit_clone($a);
 
@@ -242,7 +241,7 @@ function connedit_clone(&$a) {
 		unset($clone['abook_account']);
 		unset($clone['abook_channel']);
 
-		build_sync_packet(0 /* use the current local_user */, array('abook' => array($clone)));
+		build_sync_packet(0 /* use the current local_user */, array(array('abook' => array($clone))));
 }
 
 /* @brief Generate content of connection edit page
@@ -403,9 +402,9 @@ function connedit_content(&$a) {
 
 			contact_remove(local_user(), $orig_record[0]['abook_id']);
 			build_sync_packet(0 /* use the current local_user */, 
-				array('abook' => array(
+				array(array('abook' => array(
 					'abook_xchan' => $orig_record[0]['abook_xchan'],
-					'entry_deleted' => true)
+					'entry_deleted' => true))
 				)
 			);
 

version.inc

@@ -1 +1 @@
-2015-01-06.911
+2015-01-07.912

view/js/autocomplete.js

@@ -3,13 +3,13 @@
  *
  * require jQuery, jquery.textcomplete
  */
-
+function contact_search(term, callback, backend_url, type, extra_channels) {
-function mysearch(term, callback, backend_url, extra_channels) {
+	// Check if there is a cached result that contains the same information we would get with a full server-side search
-	// Check if there is a cached result that contains the tsame information we would get with a full server-side search
+	// Assume type hasn't changed
-	for(t in mysearch.cache) {
+	for(t in contact_search.cache) {
 		if(term.indexOf(t) >= 0) { // A more broad search has been performed already, so use those results
 			// Filter old results locally
-			var matching = mysearch.cache[t].filter(function (x) { return (x.name.indexOf(term) >= 0 || x.nick.indexOf(term) >= 0); });
+			var matching = contact_search.cache[t].filter(function (x) { return (x.name.indexOf(term) >= 0 || x.nick.indexOf(term) >= 0); });
 			callback(matching);
 			return;
 		}
@@ -19,10 +19,10 @@ function mysearch(term, callback, backend_url, extra_channels) {
 		start:0,
 		count:100,
 		search:term,
-		type:'c',
+		type:type,
 	}
 
-	if(extra_channels)
+	if(typeof extra_channels !== 'undefined' && extra_channels)
 		postdata['extra_channels[]'] = extra_channels;
 	
 	$.ajax({
@@ -34,19 +34,19 @@ function mysearch(term, callback, backend_url, extra_channels) {
 			// Cache results if we got them all (more information would not improve results)
 			// data.count represents the maximum number of items
 			if(data.items.length < data.count) {
-				mysearch.cache[term] = data.items;
+				contact_search.cache[term] = data.items;
 			}
 			callback(data.items);
 		},
 	}).fail(function () {callback([]); }); // Callback must be invoked even if something went wrong.
 }
-mysearch.cache = {};
+contact_search.cache = {};
 
-function format(item) {
+function contact_format(item) {
 	return "<div class='{0}' title='{4}'><img src='{1}'>{2} ({3})</div>".format(item.taggable, item.photo, item.name, ((item.label) ? item.nick + ' ' + item.label : item.nick), item.link )
 }
 
-function replace(item) {
+function editor_replace(item) {
 	// $2 ensures that prefix (@,@!) is preserved
 	var id = item.id;
 	 // 16 chars of hash should be enough. Full hash could be used if it can be done in a visually appealing way.
@@ -56,20 +56,28 @@ function replace(item) {
 	return '$1$2'+item.nick.replace(' ','') + '+' + id;
 }
 
+function basic_replace(item) {
+	return '$1'+item.name+' ';
+}
+
+function submit_form(e) {
+	$(e).parents('form').submit();
+}
+
 /**
- * jQuery plugin 'contact_autocomplete'
+ * jQuery plugin 'editor_autocomplete'
  */
 (function( $ ){
-	$.fn.contact_autocomplete = function(backend_url, extra_channels) {
+	$.fn.editor_autocomplete = function(backend_url, extra_channels) {
 	if (typeof extra_channels === 'undefined') extra_channels = false;
 
 	// Autocomplete contacts
 	contacts = {
 		match: /(^|\s)(@\!*)([^ \n]+)$/,
 		index: 3,
-		search: function(term, callback) { mysearch(term, callback, backend_url, extra_channels); },
+		search: function(term, callback) { contact_search(term, callback, backend_url, 'c', extra_channels); },
-		replace: replace,
+		replace: editor_replace,
-		template: format,
+		template: contact_format,
 	}
 
 	smilies = {
@@ -79,6 +87,56 @@ function replace(item) {
 		template: function(item) { return item['icon'] + item['text'] },
 		replace: function(item) { return "$1"+item['text'] + ' '; },
 	}
+	this.attr('autocomplete','off');
 	this.textcomplete([contacts,smilies],{className:'acpopup'});
   };
 })( jQuery );
+
+/**
+ * jQuery plugin 'search_autocomplete'
+ */
+(function( $ ){
+	$.fn.search_autocomplete = function(backend_url) {
+
+	// Autocomplete contacts
+	contacts = {
+		match: /(^@)([^\n]{2,})$/,
+		index: 2,
+		search: function(term, callback) { contact_search(term, callback, backend_url, 'x',[]); },
+		replace: basic_replace,
+		template: contact_format,
+	}
+	this.attr('autocomplete','off');
+	var a = this.textcomplete([contacts],{className:'acpopup',maxCount:100});
+
+	a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
+	
+  };
+})( jQuery );
+
+(function( $ ){
+	$.fn.contact_autocomplete = function(backend_url, typ, autosubmit, onselect) {
+
+	if(typeof typ === 'undefined') typ = '';
+	if(typeof autosubmit === 'undefined') autosubmit = false;
+
+	// Autocomplete contacts
+	contacts = {
+		match: /(^)([^\n]+)$/,
+		index: 2,
+		search: function(term, callback) { contact_search(term, callback, backend_url, typ,[]); },
+		replace: basic_replace,
+		template: contact_format,
+	}
+
+	this.attr('autocomplete','off');
+	var a = this.textcomplete([contacts],{className:'acpopup'});
+
+	if(autosubmit)
+		a.on('textComplete:select', function(e,value,strategy) { submit_form(this); });
+
+	if(typeof onselect !== 'undefined')
+		a.on('textComplete:select',function(e,value,strategy) { onselect(value); });
+  };
+})( jQuery );
+

view/js/main.js

@@ -577,7 +577,7 @@ function updateConvItems(mode,data) {
 	}
 
 	/* autocomplete @nicknames */
-	$(".comment-edit-form  textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
+	$(".comment-edit-form  textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 	
 	var bimgs = $(".wall-item-body img").not(function() { return this.complete; });
 	var bimgcount = bimgs.length;
@@ -604,7 +604,7 @@ function updateConvItems(mode,data) {
 					$(this).readmore({
 						collapsedHeight: divmore_height, 
 						moreLink: '<a href="#" class="divgrow-showmore">'+aStr['divgrowmore']+'</a>',
-						lessLink: '<a href="#">'+aStr['divgrowless']+'</a>'
+						lessLink: '<a href="#" class="divgrow-showmore">'+aStr['divgrowless']+'</a>'
 					});
 					$(this).addClass('divmore');
 				}

view/js/mod_connections.js

@@ -1,13 +1,5 @@
 $(document).ready(function() { 
-	var a; 
+	$("#contacts-search").contact_autocomplete(baseurl + '/acl', 'a', true);
-	a = $("#contacts-search").autocomplete({ 
-		serviceUrl: baseurl + '/acl',
-		minChars: 2,
-		width: 250,
-		id: 'contact-search-ac',
-	});
-	a.setOptions({ autoSubmit: true, params: { type: 'a' }});
-
 }); 
 
 $("#contacts-search").keyup(function(event){

view/js/mod_mail.js

@@ -1,13 +1,6 @@
 $(document).ready(function() { 
-	var a; 
+	$("#recip").contact_autocomplete(baseurl + '/acl', '', false, function(data) {
-	a = $("#recip").autocomplete({ 
+		$("#recip-complete").val(data.xid);
-		serviceUrl: baseurl + '/acl',
-		minChars: 2,
-		width: 250,
-		id: 'recip-ac',
-		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
-		},
 	});
 
 }); 

view/js/mod_message.js

@@ -1,13 +0,0 @@
-$(document).ready(function() { 
-	var a; 
-	a = $("#recip").autocomplete({ 
-		serviceUrl: baseurl + '/acl',
-		minChars: 2,
-		width: 250,
-		id: 'recip-ac',
-		onSelect: function(value,data) {
-			$("#recip-complete").val(data);
-		},
-	});
-
-}); 

view/js/mod_network.js

@@ -1,10 +1,5 @@
 $(document).ready(function() { 
-	var a; 
+	$("#search-text").contact_autocomplete(baseurl + '/acl');
-	a = $("#search-text").autocomplete({ 
-		serviceUrl: baseurl + '/search_ac',
-		minChars: 2,
-		id: 'search-text-ac',
-	});
 	$('.jslider-scale ins').addClass('hidden-xs');
 }); 
 

view/js/mod_photos.js

@@ -2,19 +2,11 @@
 var ispublic = aStr['everybody'];
 
 $(document).ready(function() {
-
+	$(document).ready(function() { 
-	var a;
+		$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
-	a = $("#photo-edit-newtag").autocomplete({ 
+			$("#photo-edit-newtag").val('@' + data.name.replace(' ','_')); // TODO: Get rid of underscore
-		serviceUrl: baseurl + '/acl',
+		});
-		minChars: 2,
+	}); 
-		width: 250,
-		id: 'newtag-ac',
-		onSelect: function(value,data) {
-			$("#photo-edit-newtag").val(data);
-		},
-	});
-	a.setOptions({ params: { type: 'p' }});
-
 
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;

view/js/mod_poke.js

@@ -1,14 +1,5 @@
 $(document).ready(function() { 
-	var a; 
+	$("#poke-recip").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
-	a = $("#poke-recip").autocomplete({ 
+		$("#poke-recip-complete").val(data.id);
-		serviceUrl: baseurl + '/acl',
-		minChars: 2,
-		width: 250,
-		id: 'poke-recip-ac',
-		onSelect: function(value,data) {
-			$("#poke-recip-complete").val(data);
-		}			
 	});
-	a.setOptions({ params: { type: 'a' }});
-
 }); 

view/js/mod_sources.js

@@ -1,15 +1,7 @@
 $(document).ready(function() { 
-	var a; 
+	$(document).ready(function() { 
-	a = $("#id_name").autocomplete({ 
+		$("#id_name").contact_autocomplete(baseurl + '/acl', 'a', false, function(data) {
-		serviceUrl: baseurl + '/acl',
+			$("#id_abook").val(data.id);
-		minChars: 2,
+		});
-		width: 250,
+	}); 
-		id: 'id-name-ac',
-		onSelect: function(value,data) {
-			$("#id_abook").val(data);
-		}			
-	});
-
-	a.setOptions({ params: { type: 'a' }});
-
 }); 

view/tpl/display-head.tpl

@@ -1,8 +1,8 @@
 <script>
 $(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
+	$(".comment-edit-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
+	$(".wall-item-comment-wrapper textarea").editor_autocomplete(baseurl+"/acl?f=&n=1");
 });
 </script>
 

view/tpl/jot-header.tpl

@@ -11,9 +11,9 @@ function initEditor(cb){
 			$("#profile-jot-text-loading").spin(false).hide();
 			$("#profile-jot-text").css({ 'height': 200, 'color': '#000' });
 			if(typeof channelId === 'undefined')
-				$("#profile-jot-text").contact_autocomplete(baseurl+"/acl");
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl");
 			else
-				$("#profile-jot-text").contact_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
+				$("#profile-jot-text").editor_autocomplete(baseurl+"/acl",[channelId]); // Also gives suggestions from current channel's connections
 			editor = true;
 			  $("a#jot-perms-icon").colorbox({ 
 				  'inline' : true, 

view/tpl/msg-header.tpl

@@ -41,7 +41,7 @@ if(plaintext != 'none') {
 	});
 }
 else
-	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+	$("#prvmail-text").editor_autocomplete(baseurl+"/acl");
 
 
 </script>