Add instance name in system configuration page

6 files changed, 12 insertions, 0 deletions

diff --git a/app/Controllers/configureController.php b/app/Controllers/configureController.php
index 7a4d0ecd7..0dc7ceab2 100755
--- a/app/Controllers/configureController.php
+++ b/app/Controllers/configureController.php
@@ -316,6 +316,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
 			$limits['max_feeds'] = Minz_Request::param('max-feeds', 16384);
 			$limits['max_categories'] = Minz_Request::param('max-categories', 16384);
 			FreshRSS_Context::$system_conf->limits = $limits;
+			FreshRSS_Context::$system_conf->title = Minz_Request::param('instance-name', 'FreshRSS');
 			FreshRSS_Context::$system_conf->save();
 
 			invalidateHttpCache();
diff --git a/app/i18n/cz/admin.php b/app/i18n/cz/admin.php
index 6c9156335..e1fa5d141 100644
--- a/app/i18n/cz/admin.php
+++ b/app/i18n/cz/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration', // @todo translate
+		'instance-name' => 'Instance name', // @todo translate
 		'max-categories' => 'Categories per user limit', // @todo translate
 		'max-feeds' => 'Feeds per user limit', // @todo translate
 		'registration' => array(
diff --git a/app/i18n/de/admin.php b/app/i18n/de/admin.php
index 26d0bcd36..395b51acf 100644
--- a/app/i18n/de/admin.php
+++ b/app/i18n/de/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration', // @todo translate
+		'instance-name' => 'Instance name', // @todo translate
 		'max-categories' => 'Categories per user limit', // @todo translate
 		'max-feeds' => 'Feeds per user limit', // @todo translate
 		'registration' => array(
diff --git a/app/i18n/en/admin.php b/app/i18n/en/admin.php
index ad9038203..6edb38cf0 100644
--- a/app/i18n/en/admin.php
+++ b/app/i18n/en/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'System configuration',
+		'instance-name' => 'Instance name',
 		'max-categories' => 'Categories per user limit',
 		'max-feeds' => 'Feeds per user limit',
 		'registration' => array(
diff --git a/app/i18n/fr/admin.php b/app/i18n/fr/admin.php
index 44e013c2f..e73622577 100644
--- a/app/i18n/fr/admin.php
+++ b/app/i18n/fr/admin.php
@@ -148,6 +148,7 @@ return array(
 	),
 	'system' => array(
 		'_' => 'Configuration du système',
+		'instance-name' => 'Nom de l’instance',
 		'max-categories' => 'Limite de catégories par utilisateur',
 		'max-feeds' => 'Limite de flux par utilisateur',
 		'registration' => array(
diff --git a/app/views/configure/system.phtml b/app/views/configure/system.phtml
index 9c9813729..9406c34d6 100644
--- a/app/views/configure/system.phtml
+++ b/app/views/configure/system.phtml
@@ -7,6 +7,13 @@
 		<legend><?php echo _t('admin.system'); ?></legend>
 
 		<div class="form-group">
+			<label class="group-name" for="instance-name"><?php echo _t('admin.system.instance-name'); ?></label>
+			<div class="group-controls">
+			    <input type="text" id="max-feeds" name="instance-name" value="<?php echo FreshRSS_Context::$system_conf->title; ?>" min="1" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->title; ?>"/>
+			</div>
+		</div>
+
+		<div class="form-group">
 			<label class="group-name" for="max-registrations"><?php echo _t('admin.system.registration.number'); ?></label>
 			<div class="group-controls">
 				<input type="number" id="max-registrations" name="max-registrations" value="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>" min="0" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->limits['max_registrations']; ?>"/>