From 10ed334e8c81d1db4a506716b78ece13dc69266c Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 17 Jan 2016 16:29:32 -0800
Subject: various issues from the forums

---
 boot.php | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index b5a68b149..f6e35cf4e 100755
--- a/boot.php
+++ b/boot.php
@@ -998,7 +998,7 @@ class App {
 			'$user_scalable' => $user_scalable,
 			'$baseurl' => $this->get_baseurl(),
 			'$local_channel' => local_channel(),
-			'$generator' => PLATFORM_NAME . ' ' . RED_VERSION,
+			'$generator' => get_platform_name() . ((get_project_version()) ? ' ' . get_project_version() : ''),
 			'$update_interval' => $interval,
 			'$icon' => head_get_icon(),
 			'$head_css' => head_get_css(),
@@ -2338,3 +2338,26 @@ function check_cron_broken() {
 	set_config('system','lastpollcheck',datetime_convert());
 	return;
 }
+
+
+function get_platform_name() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['platform_name'])
+		return $a->config['system']['platform_name'];
+	return PLATFORM_NAME;
+}
+
+function get_project_version() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version'])
+		return '';
+	return RED_VERSION;
+}
+
+function get_update_version() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['hide_version'])
+		return '';
+	return DB_UPDATE_VERSION;
+}
+
-- 
cgit v1.2.3


From be83855acf2db7f4f55d4cb30878c67d53ca69b6 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Sun, 17 Jan 2016 16:50:37 -0800
Subject: generalise the site icon

---
 boot.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index f6e35cf4e..143d7de46 100755
--- a/boot.php
+++ b/boot.php
@@ -2361,3 +2361,18 @@ function get_update_version() {
 	return DB_UPDATE_VERSION;
 }
 
+
+function get_notify_icon() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['email_notify_icon_url'])
+		return $a->config['system']['email_notify_icon_url'];
+	return z_root() . '/images/hz-white-32.png';
+}
+
+function get_site_icon() {
+	$a = get_app();
+	if(is_array($a->config) && is_array($a->config['system']) && $a->config['system']['site_icon_url'])
+		return $a->config['system']['site_icon_url'];
+	return z_root() . '/images/hz-32.png';
+}
+
-- 
cgit v1.2.3


From c15e3de63759602bac87a57142a73db1166bc5ec Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Tue, 19 Jan 2016 15:21:03 -0800
Subject: hook changed, up the std_version

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'boot.php')

diff --git a/boot.php b/boot.php
index 143d7de46..4db0e56a5 100755
--- a/boot.php
+++ b/boot.php
@@ -48,7 +48,7 @@ require_once('include/AccessList.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'RED_VERSION',             trim(file_get_contents('version.inc')));
-define ( 'STD_VERSION',             '1.1.2' );
+define ( 'STD_VERSION',             '1.1.3' );
 define ( 'ZOT_REVISION',            1     );
 
 define ( 'DB_UPDATE_VERSION',       1161  );
-- 
cgit v1.2.3