From ceeb4db6e304c26ebe56311743eb9baca69f7066 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 24 Oct 2012 19:13:29 -0700
Subject: Give the UI a little love after all the backend mods

---
 mod/abook.php    |  1 -
 mod/acl.php      | 21 +++++++++++++++++----
 mod/contacts.php |  1 -
 mod/message.php  |  1 -
 mod/network.php  |  2 --
 mod/poke.php     |  1 -
 mod/profile.php  |  2 +-
 7 files changed, 18 insertions(+), 11 deletions(-)

(limited to 'mod')

diff --git a/mod/abook.php b/mod/abook.php
index 7aa4e9e05..5ef43a653 100644
--- a/mod/abook.php
+++ b/mod/abook.php
@@ -45,7 +45,6 @@ function abook_init(&$a) {
 
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
 	$a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() { 
diff --git a/mod/acl.php b/mod/acl.php
index f3e46efa5..51aa7651b 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -4,8 +4,6 @@
 require_once("include/acl_selectors.php");
 
 function acl_init(&$a){
-	if(!local_user())
-		return "";
 
 
 	$start = (x($_REQUEST,'start')?$_REQUEST['start']:0);
@@ -22,12 +20,19 @@ function acl_init(&$a){
 		$search = $_REQUEST['query'];
 	}
 
+logger("acl: $search"); 
+
+	if(! (local_user() || $type == 'x'))
+		return "";
+
+
 
 	if ($search!=""){
 		$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
 		$sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
+		$sql_extra3 = "AND ( xchan_name like '%%" . dbesc($search) . "%%' )";
 	} else {
-		$sql_extra = $sql_extra2 = "";
+		$sql_extra = $sql_extra2 = $sql_extra3 = "";
 	}
 	
 	// count groups and contacts
@@ -142,11 +147,19 @@ function acl_init(&$a){
 			intval(local_user())
 		);
 	}
+	elseif($type == 'x') {
+		$r = q("SELECT xchan_name as id, xchan_name as name, xchan_photo_s as micro, xchan_profile as url from xchan
+			where 1
+			$sql_extra3
+			ORDER BY `xchan_name` ASC ",
+			intval(local_user())
+		);
+	}
 	else
 		$r = array();
 
 
-	if($type == 'm' || $type == 'a') {
+	if($type == 'm' || $type == 'a' || $type == 'x') {
 		$x = array();
 		$x['query'] = $search;
 		$x['photos'] = array();
diff --git a/mod/contacts.php b/mod/contacts.php
index 908c348f4..09a4e6c97 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -45,7 +45,6 @@ function contacts_init(&$a) {
 
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
 	$a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() { 
diff --git a/mod/message.php b/mod/message.php
index 7ebd4567a..25b3b2813 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -18,7 +18,6 @@ function message_init(&$a) {
 	));
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
 	$a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() { 
diff --git a/mod/network.php b/mod/network.php
index b431c67a1..8793aa51a 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -102,8 +102,6 @@ function network_init(&$a) {
 
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
-
 	$a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() { 
diff --git a/mod/poke.php b/mod/poke.php
index 739690386..163ef0cd8 100755
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -156,7 +156,6 @@ function poke_content(&$a) {
 
 	$base = $a->get_baseurl();
 
-	$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
 	$a->page['htmlhead'] .= <<< EOT
 
 <script>$(document).ready(function() { 
diff --git a/mod/profile.php b/mod/profile.php
index 6680636a7..12b494cfe 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -127,7 +127,7 @@ function profile_content(&$a, $update = 0) {
 		if(x($_GET,'tab'))
 			$tab = notags(trim($_GET['tab']));
 
-		$o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
+//		$o.=profile_tabs($a, $is_owner, $a->profile['nickname']);
 
 
 		if($tab === 'profile') {
-- 
cgit v1.2.3