From 43c2b22fca908cb5c7bb740855cbd9d04e085d62 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 17 May 2016 19:49:21 -0700
Subject: cli utilities - argc and argv reversed. Not functionally incorrect
 since it was consistent but aesthetically incorrect.

---
 Zotlabs/Project/System.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Project')

diff --git a/Zotlabs/Project/System.php b/Zotlabs/Project/System.php
index f61313da0..7ee848411 100644
--- a/Zotlabs/Project/System.php
+++ b/Zotlabs/Project/System.php
@@ -5,7 +5,7 @@ namespace Zotlabs\Project;
 class System {
 
 	static public function get_platform_name() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['platform_name'])
+		if(is_array(\App::$config) && is_array(\App::$config['system']) && array_key_exists('platform_name',\App::$config['system']))
 			return \App::$config['system']['platform_name'];
 		return PLATFORM_NAME;
 	}
-- 
cgit v1.2.3


From d38851023ec5bac78ece9469c758851e97e01285 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Wed, 18 May 2016 16:28:51 -0700
Subject: provide server role on pubsites page

---
 Zotlabs/Project/System.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Zotlabs/Project')

diff --git a/Zotlabs/Project/System.php b/Zotlabs/Project/System.php
index 7ee848411..d95bd033c 100644
--- a/Zotlabs/Project/System.php
+++ b/Zotlabs/Project/System.php
@@ -45,7 +45,7 @@ class System {
 	static public function get_server_role() {
 		if(UNO)
 			return 'basic';
-		return 'advanced';
+		return 'pro';
 	}
 
 	static public function get_std_version() {
-- 
cgit v1.2.3


From d8ace38041ad3ef161cf9c727c94b6ce2a00ce75 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 20 May 2016 22:52:47 -0700
Subject: rework the conversation object stuff at a high level - still needs a
 bit of refactoring

---
 Zotlabs/Project/System.php | 58 ----------------------------------------------
 1 file changed, 58 deletions(-)
 delete mode 100644 Zotlabs/Project/System.php

(limited to 'Zotlabs/Project')

diff --git a/Zotlabs/Project/System.php b/Zotlabs/Project/System.php
deleted file mode 100644
index d95bd033c..000000000
--- a/Zotlabs/Project/System.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-namespace Zotlabs\Project;
-
-class System {
-
-	static public function get_platform_name() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && array_key_exists('platform_name',\App::$config['system']))
-			return \App::$config['system']['platform_name'];
-		return PLATFORM_NAME;
-	}
-
-	static public function get_site_name() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['sitename'])
-			return \App::$config['system']['sitename'];
-		return '';
-	}
-
-	static public function get_project_version() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
-			return '';
-		return self::get_std_version();
-	}
-
-	static public function get_update_version() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['hide_version'])
-			return '';
-		return DB_UPDATE_VERSION;
-	}
-
-
-	static public function get_notify_icon() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['email_notify_icon_url'])
-			return \App::$config['system']['email_notify_icon_url'];
-		return z_root() . '/images/hz-white-32.png';
-	}
-
-	static public function get_site_icon() {
-		if(is_array(\App::$config) && is_array(\App::$config['system']) && \App::$config['system']['site_icon_url'])
-			return \App::$config['system']['site_icon_url'];
-		return z_root() . '/images/hz-32.png';
-	}
-
-
-	static public function get_server_role() {
-		if(UNO)
-			return 'basic';
-		return 'pro';
-	}
-
-	static public function get_std_version() {
-		if(defined('STD_VERSION'))
-			return STD_VERSION;
-		return '0.0.0';
-	}
-
-
-}
-- 
cgit v1.2.3