bring back colour to abook_self in acl

2 files changed, 7 insertions, 7 deletions

diff --git a/doc/main.bb b/doc/main.bb
index 4428b152b..6998ee90e 100644
--- a/doc/main.bb
+++ b/doc/main.bb
@@ -1,14 +1,14 @@
 

-[zrl=[baseurl]/help/about][b]What is the $Projectname?[/b][/zrl]

+[zrl=[baseurl]/help/about][b]What is $Projectname?[/b][/zrl]

 $Projectname is a decentralized communication and publishing platform that enables you to keep in control of your communication needs by automatic encryption and finely grained access control. It's you, and only you who decides who is allowed to see your stuff.

 

 [zrl=[baseurl]/help/features][b]$Projectname Features[/b][/zrl]

 

-The $Projectname is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis. 

+$Projectname is already running as a global distributed network and proves its versatility and scalability from standalone to huge sites on a daily basis. 

 Think of standalone family communication platforms, distributed online communities, support forums, blogs and homepages. Or professional content providers with commercial premium channels and targeted content acces. Whatever you want, the $Projectname is there to cater to your creativity.

 

 [zrl=[baseurl]/help/what_is_zot][b]Got Zot? Well, you should.[/b][/zrl]

-Zot is the great new communicaton protocol invented especially for the $Projectname. As a member you are no longer bound to a single site or hub thanks to "Nomadic Identities". Migrate easily to another server and keep your contacts intact, or clone it and run the same channel on several servers. Just in case one of them might shut down, you don't lose out. Plus once you are inside the $Projectname there is no need for you to authenticate twice, even when accessing another $Projectname site. Zot is what sets the $Projectname apart. 

+Zot is the great new communicaton protocol invented especially for $Projectname. As a member you are no longer bound to a single site or hub thanks to "Nomadic Identities". Migrate easily to another server and keep your contacts intact, or clone it and run the same channel on several servers. Just in case one of them might shut down, you don't lose out. Plus once you are inside $Projectname there is no need for you to authenticate twice, even when accessing another $Projectname site. Zot is what sets $Projectname apart. 

 

 [h3]Getting Started[/h3]

 [zrl=[baseurl]/help/Privacy]Privacy Policy[/zrl]

diff --git a/mod/acl.php b/mod/acl.php
index 6383d774c..dc29e3eff 100644
--- a/mod/acl.php
+++ b/mod/acl.php
@@ -92,7 +92,7 @@ function acl_init(&$a){
 			if($extra_channels_sql != '')
 				$extra_channels_sql = " OR (abook_channel IN ($extra_channels_sql)) and abook_hidden = 0 ";
 
-			$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags 
+			$r = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self 
 				FROM abook left join xchan on abook_xchan = xchan_hash 
 				WHERE (abook_channel = %d $extra_channels_sql) AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
 				intval(local_channel())
@@ -100,7 +100,7 @@ function acl_init(&$a){
 
 		}
 		else { // Visitors
-			$r = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags
+			$r = q("SELECT xchan_hash as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self
 				FROM xchan left join xlink on xlink_link = xchan_hash
 				WHERE xlink_xchan  = '%s' AND xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" ,
 				dbesc(get_observer_hash())
@@ -116,7 +116,7 @@ function acl_init(&$a){
 						$known_hashes[] = "'".$rr['hash']."'";
 				$known_hashes_sql = 'AND xchan_hash not in ('.join(',',$known_hashes).')';
 
-				$r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags 
+				$r2 = q("SELECT abook_id as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, abook_their_perms, abook_flags, abook_self 
 					FROM abook left join xchan on abook_xchan = xchan_hash 
 					WHERE abook_channel IN ($extra_channels_sql) $known_hashes_sql AND abook_blocked = 0 and abook_pending = 0 and abook_archived = 0 and abook_hidden = 0 and xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc");
 				if($r2)
@@ -145,7 +145,7 @@ function acl_init(&$a){
 		}
 		if(intval(get_config('system','taganyone')) || intval(get_pconfig(local_channel(),'system','taganyone'))) {
 			if((count($r) < 100) && $type == 'c') {
-				$r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags 
+				$r2 = q("SELECT substr(xchan_hash,1,18) as id, xchan_hash as hash, xchan_name as name, xchan_photo_s as micro, xchan_url as url, xchan_addr as nick, 0 as abook_their_perms, 0 as abook_flags, 0 as abook_self 
 					FROM xchan 
 					WHERE xchan_deleted = 0 $sql_extra2 order by $order_extra2 xchan_name asc" 
 				);