provide get_server_role() to abstract different roles and capabilities

4 files changed, 9 insertions, 2 deletions

diff --git a/boot.php b/boot.php
index 1628dd0fd..1f214c400 100755
--- a/boot.php
+++ b/boot.php
@@ -2394,3 +2394,9 @@ function get_site_icon() {
 	return z_root() . '/images/hz-32.png';
 }
 
+
+function get_server_role() {
+	if(UNO)
+		return 'basic';
+	return 'advanced';
+}
diff --git a/include/identity.php b/include/identity.php
index 0b9842caf..641f188f4 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -484,7 +484,7 @@ function identity_basic_export($channel_id, $items = false) {
 
 	// use constants here as otherwise we will have no idea if we can import from a site 
 	// with a non-standard platform and version.
-	$ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => UNO );
+	$ret['compatibility'] = array('project' => PLATFORM_NAME, 'version' => RED_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => get_server_role());
 
 	$r = q("select * from channel where channel_id = %d limit 1",
 		intval($channel_id)
diff --git a/include/network.php b/include/network.php
index fe6b553e9..1d0159ea5 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1805,6 +1805,7 @@ function get_site_info() {
 	$data = Array(
 		'version' => $version,
 		'version_tag' => $tag,
+		'server_role' => get_server_role(),
 		'commit' => $commit,
 		'url' => z_root(),
 		'plugins' => $visible_plugins,
diff --git a/mod/import.php b/mod/import.php
index 1a2c87a63..0bbd38ffe 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -120,7 +120,7 @@ function import_account(&$a, $account_id) {
 			notice($t);
 		}
 		if(array_key_exists('server_role',$data['compatibility']) 
-			&& $data['compatibility']['server_role'] != UNO) {
+			&& $data['compatibility']['server_role'] != get_server_role()) {
 			notice( t('Server platform is not compatible. Operation not permitted.') . EOL);
 			return;
 		}