merge branch perms_ng into dev

1 files changed, 20 insertions, 20 deletions

diff --git a/include/permissions.php b/include/permissions.php
index d94b70da6..bbd13ed58 100644
--- a/include/permissions.php
+++ b/include/permissions.php
@@ -21,7 +21,7 @@ require_once('include/security.php');
  * @param bool $default_ignored (default true)
  *          if false, lie and pretend the ignored person has permissions you are ignoring (used in channel discovery)
  *
- * @returns array of all permissions, key is permission name, value is true or false
+ * @returns array of all permissions, key is permission name, value is 1 or 0
  */
 function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_ignored = true) {
 
@@ -61,7 +61,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 		// The uid provided doesn't exist. This would be a big fail.
 
 		if(! $r) {
-			$ret[$perm_name] = false;
+			$ret[$perm_name] = 0;
 			continue;
 		}
 
@@ -70,7 +70,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 
 		if($observer_xchan) {
 			if($channel_perm & PERMS_AUTHED) {
-				$ret[$perm_name] = true;
+				$ret[$perm_name] = 1;
 				continue;
 			}
 
@@ -104,7 +104,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 			// If they're blocked - they can't read or write
 
 			if(($x) && intval($x[0]['abook_blocked'])) {
-				$ret[$perm_name] = false;
+				$ret[$perm_name] = 0;
 				continue;
 			}
 
@@ -115,7 +115,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 
 
 			if(($x) && ($default_ignored) && in_array($perm_name,$blocked_anon_perms) && intval($x[0]['abook_ignored'])) {
-				$ret[$perm_name] = false;
+				$ret[$perm_name] = 0;
 				continue;
 			}
 		}
@@ -123,7 +123,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 		// system is blocked to anybody who is not authenticated
 
 		if(($check_siteblock) && (! $observer_xchan) && intval(get_config('system', 'block_public'))) {
-			$ret[$perm_name] = false;
+			$ret[$perm_name] = 0;
 			continue;
 		}
 
@@ -133,16 +133,16 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 
 		if(($observer_xchan) && ($r[0]['channel_hash'] === $observer_xchan)) {
 			if($r[0]['channel_moved'] && (in_array($perm_name,$blocked_anon_perms)))
-				$ret[$perm_name] = false;
+				$ret[$perm_name] = 0;
 			else
-				$ret[$perm_name] = true;
+				$ret[$perm_name] = 1;
 			continue;
 		}
 
 		// Anybody at all (that wasn't blocked or ignored). They have permission.
 
 		if($channel_perm & PERMS_PUBLIC) {
-			$ret[$perm_name] = true;
+			$ret[$perm_name] = 1;
 			continue;
 		}
 
@@ -150,7 +150,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 		// out, permission is denied.
 
 		if(! $observer_xchan) {
-			$ret[$perm_name] = false;
+			$ret[$perm_name] = 0;
 			continue;
 		}
 
@@ -158,7 +158,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 
 		if($channel_perm & PERMS_NETWORK) {
 			if($x && $x[0]['xchan_network'] === 'zot6') {
-				$ret[$perm_name] = true;
+				$ret[$perm_name] = 1;
 				continue;
 			}
 		}
@@ -175,9 +175,9 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 			}
 
 			if($c)
-				$ret[$perm_name] = true;
+				$ret[$perm_name] = 1;
 			else
-				$ret[$perm_name] = false;
+				$ret[$perm_name] = 0;
 
 			continue;
 		}
@@ -186,19 +186,19 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 		// handle whether we're allowing any, approved or specific ones
 
 		if(! $x) {
-			$ret[$perm_name] = false;
+			$ret[$perm_name] = 0;
 			continue;
 		}
 
 		// They are in your address book, but haven't been approved
 
 		if($channel_perm & PERMS_PENDING && (! intval($x[0]['abook_pseudo']))) {
-			$ret[$perm_name] = true;
+			$ret[$perm_name] = 1;
 			continue;
 		}
 
 		if(intval($x[0]['abook_pending'])) {
-			$ret[$perm_name] = false;
+			$ret[$perm_name] = 0;
 			continue;
 		}
 
@@ -207,11 +207,11 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 		if($channel_perm & PERMS_CONTACTS) {
 			// it was a fake abook entry, not really a connection
 			if(array_key_exists('abook_pseudo',$x[0]) && intval($x[0]['abook_pseudo'])) {
-				$ret[$perm_name] = false;
+				$ret[$perm_name] = 0;
 				continue;
 			}
 
-			$ret[$perm_name] = true;
+			$ret[$perm_name] = 1;
 			continue;
 		}
 
@@ -221,7 +221,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 			if($abperms) {
 				foreach($abperms as $ab) {
 					if(($ab['cat'] == 'my_perms') && ($ab['k'] == $perm_name)) {
-						$ret[$perm_name] = (intval($ab['v']) ? true : false);
+						$ret[$perm_name] = (intval($ab['v']) ? 1 : 0);
 						break;
 					}
 				}
@@ -231,7 +231,7 @@ function get_all_perms($uid, $observer_xchan, $check_siteblock = true, $default_
 
 		// No permissions allowed.
 
-		$ret[$perm_name] = false;
+		$ret[$perm_name] = 0;
 		continue;
 	}