Merge remote-tracking branch 'upstream/master'

1 files changed, 39 insertions, 1 deletions

diff --git a/boot.php b/boot.php
index b5a68b149..143d7de46 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,41 @@ 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;
+}
+
+
+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';
+}
+