mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-05 21:55:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make auto-update server URL alterable

Browse Source 
See https://github.com/FreshRSS/FreshRSS/issues/1019
This commit is contained in:
Marien Fressinaud
2015-11-02 21:11:31 +01:00
parent bb0556543d
commit 697817eebf
11 changed files with 36 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -11,6 +11,8 @@
* Visual alert on categories containing feeds in error [#984](https://github.com/FreshRSS/FreshRSS/pull/984)
* I18n
* Italian [#1003](https://github.com/FreshRSS/FreshRSS/issues/1003)
* Misc.
* Make auto-update server URL alterable [#1019](https://github.com/FreshRSS/FreshRSS/issues/1019)
## 2015-09-12 FreshRSS 1.1.3-beta

1
app/Controllers/configureController.php
View File

@@ -317,6 +317,7 @@ class FreshRSS_configure_Controller extends Minz_ActionController {
$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->auto_update_url = Minz_Request::param('auto-update-url', false);
FreshRSS_Context::$system_conf->save();
invalidateHttpCache();

8
app/Models/ConfigurationSetter.php
View File

@@ -378,4 +378,12 @@ class FreshRSS_ConfigurationSetter {
private function _unsafe_autologin_enabled(&$data, $value) {
$data['unsafe_autologin_enabled'] = $this->handleBool($value);
}
private function _auto_update_url(&$data, $value) {
if (!$value) {
return;
}
$data['auto_update_url'] = $value;
}
}

1
app/i18n/cz/admin.php
View File

@@ -148,6 +148,7 @@ return array(
),
'system' => array(
'_' => 'System configuration', // @todo translate
'auto-update-url' => 'Auto-update server URL', // @todo translate
'instance-name' => 'Instance name', // @todo translate
'max-categories' => 'Categories per user limit', // @todo translate
'max-feeds' => 'Feeds per user limit', // @todo translate

1
app/i18n/de/admin.php
View File

@@ -148,6 +148,7 @@ return array(
),
'system' => array(
'_' => 'System configuration', // @todo translate
'auto-update-url' => 'Auto-update server URL', // @todo translate
'instance-name' => 'Instance name', // @todo translate
'max-categories' => 'Categories per user limit', // @todo translate
'max-feeds' => 'Feeds per user limit', // @todo translate

1
app/i18n/en/admin.php
View File

@@ -148,6 +148,7 @@ return array(
),
'system' => array(
'_' => 'System configuration',
'auto-update-url' => 'Auto-update server URL',
'instance-name' => 'Instance name',
'max-categories' => 'Categories per user limit',
'max-feeds' => 'Feeds per user limit',

1
app/i18n/fr/admin.php
View File

@@ -148,6 +148,7 @@ return array(
),
'system' => array(
'_' => 'Configuration du système',
'auto-update-url' => 'URL du service de mise à jour',
'instance-name' => 'Nom de l’instance',
'max-categories' => 'Limite de catégories par utilisateur',
'max-feeds' => 'Limite de flux par utilisateur',

1
app/i18n/it/admin.php
View File

@@ -148,6 +148,7 @@ return array(
),
'system' => array(
'_' => 'Configurazione di sistema',
'auto-update-url' => 'Auto-update server URL', // @todo translate
'instance-name' => 'Nome istanza',
'max-categories' => 'Limite categorie per utente',
'max-feeds' => 'Limite feeds per utente',

11
app/i18n/nl/admin.php
View File

@@ -146,6 +146,17 @@ return array(
'title' => 'Statistieken',
'top_feed' => 'Top tien feeds',
),
'system' => array(
'_' => 'System configuration', // @todo translate
'auto-update-url' => 'Auto-update server URL', // @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(
'help' => '0 means that there is no account limit', // @todo translate
'number' => 'Max number of accounts', // @todo translate
),
),
'update' => array(
'_' => 'Versie controle',
'apply' => 'Toepassen',

1
app/i18n/nl/gen.php
View File

@@ -139,6 +139,7 @@ return array(
'sharing' => 'Delen',
'shortcuts' => 'Snelle toegang',
'stats' => 'Statistieken',
'system' => 'System configuration', // @todo translate
'update' => 'Versie controle',
'user_management' => 'Beheer gebruikers',
'user_profile' => 'Profiel',

9
app/views/configure/system.phtml
View File

@@ -9,7 +9,14 @@
<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; ?>"/>
<input type="text" class="extend" id="instance-name" name="instance-name" value="<?php echo FreshRSS_Context::$system_conf->title; ?>" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->title; ?>"/>
</div>
</div>
<div class="form-group">
<label class="group-name" for="auto-update-url"><?php echo _t('admin.system.auto-update-url'); ?></label>
<div class="group-controls">
<input type="text" class="extend" id="auto-update-url" name="auto-update-url" value="<?php echo FreshRSS_Context::$system_conf->auto_update_url; ?>" data-leave-validation="<?php echo FreshRSS_Context::$system_conf->auto_update_url; ?>"/>
</div>
</div>