mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-04 06:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo (extensions)

Browse Source 
- change feedback.extension into feedback.extensions
- disable button is pushed by default

See https://github.com/FreshRSS/FreshRSS/issues/252
This commit is contained in:
Marien Fressinaud
2014-12-06 16:48:13 +01:00
parent 4c888590e6
commit 9d66462c1d
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Controllers/extensionController.php
View File

@@ -45,11 +45,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
$ext = Minz_ExtensionManager::find_extension($ext_name);
if (is_null($ext)) {
Minz_Request::bad('feedback.extension.not_found', $url_redirect);
Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
}
if ($ext->is_enabled()) {
Minz_Request::bad('feedback.extension.already_enabled', $url_redirect);
Minz_Request::bad('feedback.extensions.already_enabled', $url_redirect);
}
if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -58,16 +58,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
Minz_Configuration::addExtension($ext_name);
Minz_Configuration::writeFile();
Minz_Request::good('feedback.extension.enabled', $url_redirect);
Minz_Request::good('feedback.extensions.enabled', $url_redirect);
} elseif ($ext->getType() === 'user') {
$ext->install();
FreshRSS_Context::$conf->addExtension($ext_name);
FreshRSS_Context::$conf->save();
Minz_Request::good('feedback.extension.enabled', $url_redirect);
Minz_Request::good('feedback.extensions.enabled', $url_redirect);
} else {
Minz_Request::bad('feedback.extension.no_access', $url_redirect);
Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
}
}
@@ -90,11 +90,11 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
$ext = Minz_ExtensionManager::find_extension($ext_name);
if (is_null($ext)) {
Minz_Request::bad('feedback.extension.not_found', $url_redirect);
Minz_Request::bad('feedback.extensions.not_found', $url_redirect);
}
if (!$ext->is_enabled()) {
Minz_Request::bad('feedback.extension.not_enabled', $url_redirect);
Minz_Request::bad('feedback.extensions.not_enabled', $url_redirect);
}
if ($ext->getType() === 'system' && FreshRSS_Auth::hasAccess('admin')) {
@@ -103,16 +103,16 @@ class FreshRSS_extension_Controller extends Minz_ActionController {
Minz_Configuration::removeExtension($ext_name);
Minz_Configuration::writeFile();
Minz_Request::good('feedback.extension.disabled', $url_redirect);
Minz_Request::good('feedback.extensions.disabled', $url_redirect);
} elseif ($ext->getType() === 'user') {
$ext->uninstall();
FreshRSS_Context::$conf->removeExtension($ext_name);
FreshRSS_Context::$conf->save();
Minz_Request::good('feedback.extension.disabled', $url_redirect);
Minz_Request::good('feedback.extensions.disabled', $url_redirect);
} else {
Minz_Request::bad('feedback.extension.no_access', $url_redirect);
Minz_Request::bad('feedback.extensions.no_access', $url_redirect);
}
}

2
app/views/extension/index.phtml
View File

@@ -15,7 +15,7 @@
<div class="stick">
<a class="btn open-slider" href="<?php echo _url('extension', 'configure', 'e', $name_encoded); ?>"><?php echo _i('configure'); ?> <?php echo _t('admin.extensions.manage'); ?></a>
<?php if ($ext->is_enabled()) { ?>
<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
<button class="btn active" form="form-extension" formaction="<?php echo _url('extension', 'disable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.disable'); ?></button>
<?php } else { ?>
<button class="btn" form="form-extension" formaction="<?php echo _url('extension', 'enable', 'e', $name_encoded); ?>"><?php echo _t('admin.extensions.enable'); ?></button>
<?php } ?>